Fix npe (#2842)

apache · Aug 21, 2019 · f64a866 · f64a866
1 parent 5bce92c
commit f64a866
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/weex_core/Source/android/bridge/script_bridge_in_multi_process.cpp b/weex_core/Source/android/bridge/script_bridge_in_multi_process.cpp
@@ -72,9 +72,9 @@ static std::unique_ptr<IPCResult> HandleReportException(
   }
 
   WeexCoreManager::Instance()->script_thread()->message_loop()->PostTask(
-      weex::base::MakeCopyable([pageId = std::string(pageId),
-                                funcS = std::string(func),
-                                exceptionStr = std::string(exceptionInfo)] {
+      weex::base::MakeCopyable([pageId = std::string(pageId == nullptr ? "" : pageId),
+                                funcS = std::string(func == nullptr ? "" : func),
+                                exceptionStr = std::string(exceptionInfo == nullptr ? "" : exceptionInfo)] {
         WeexCoreManager::Instance()
             ->script_bridge()
             ->core_side()

diff --git a/weex_core/Source/android/jsengine/weex_jsc_utils.cpp b/weex_core/Source/android/jsengine/weex_jsc_utils.cpp
@@ -540,7 +540,8 @@ void ReportException(JSGlobalObject *_globalObject, Exception *exception, const
     CString data = exceptionInfo.utf8();
 
     auto *globalObject = static_cast<WeexGlobalObject *>(_globalObject);
-    globalObject->js_bridge()->core_side()->ReportException(instanceid, func, data.data());
+    const char *exception_char = data.data();
+    globalObject->js_bridge()->core_side()->ReportException(instanceid, func, exception_char == nullptr? "" : exception_char);
 }