From 85c9805301eec0474e3b960fae8032ed43594337 Mon Sep 17 00:00:00 2001 From: Jiyun Yang Date: Wed, 15 May 2019 15:05:44 +0900 Subject: [PATCH] Add null pointer check code to WebView binding Change-Id: Id71d0f2578b39b203267033cc683278cc93356e6 Signed-off-by: Jiyun Yang --- dali-csharp-binder/src/dali_wrap.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp index d64274c..1b4b8de 100755 --- a/dali-csharp-binder/src/dali_wrap.cpp +++ b/dali-csharp-binder/src/dali_wrap.cpp @@ -103471,13 +103471,16 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_WebView_EvaluateJavaScript(void * jarg1, std::string jarg2_str = std::string(jarg2); arg2 = &jarg2_str; - void (*handler)(char*) = (void (*)(char*)) jarg3; - { try { - (arg1)->EvaluateJavaScript((std::string const &)*arg2, [handler](const std::string& result) { - handler(SWIG_csharp_string_callback(result.c_str())); - }); + if (jarg3) { + void (*handler)(char*) = (void (*)(char*)) jarg3; + (arg1)->EvaluateJavaScript((std::string const &)*arg2, [handler](const std::string& result) { + handler(SWIG_csharp_string_callback(result.c_str())); + }); + } else { + (arg1)->EvaluateJavaScript((std::string const &)*arg2); + } } catch (std::out_of_range& e) { { SWIG_CSharpException(SWIG_IndexError, const_cast(e.what())); return ; -- 2.7.4