!1435 增加判空

Merge pull request !1435 from weimengxue/master

ipc/native/src/napi_common/source/napi_remote_object.cpp

@@ -375,7 +375,13 @@ napi_value NAPIRemoteObject::ThenCallback(napi_env env, napi_callback_info info)
     napi_value argv[ARGV_LENGTH_1] = {nullptr};
     void* data = nullptr;
     napi_get_cb_info(env, info, &argc, argv, nullptr, &data);
+    napi_value res;
     CallbackParam *param = static_cast<CallbackParam *>(data);
+    if (param == nullptr) {
+        ZLOGE(LOG_LABEL, "param is null");
+        napi_get_undefined(env, &res);
+        return res;
+    }
     bool result = false;
     napi_get_value_bool(param->env, argv[ARGV_INDEX_0], &result);
     if (!result) {
@@ -391,7 +397,6 @@ napi_value NAPIRemoteObject::ThenCallback(napi_env env, napi_callback_info info)
     std::unique_lock<std::mutex> lock(param->lockInfo->mutex);
     param->lockInfo->ready = true;
     param->lockInfo->condition.notify_all();
-    napi_value res;
     napi_get_undefined(env, &res);
     return res;
 }

ipc/native/test/fuzztest/c/getfeaturesize_fuzzer/BUILD.gn

@@ -49,7 +49,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":GetFeatureSizeFuzzTest",
+    # ":GetFeatureSizeFuzzTest",
   ]
 }
 

ipc/native/test/fuzztest/c/getrpcfeatureack_fuzzer/BUILD.gn

@@ -50,7 +50,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":GetRpcFeatureAckFuzzTest",
+    # ":GetRpcFeatureAckFuzzTest",
   ]
 }
 

ipc/native/test/fuzztest/c/gettokenfromdata_fuzzer/BUILD.gn

@@ -49,7 +49,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":GetTokenFromDataFuzzTest",
+    # ":GetTokenFromDataFuzzTest",
   ]
 }
 

ipc/native/test/fuzztest/c/gettokenidsize_fuzzer/BUILD.gn

@@ -50,7 +50,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":GetTokenIdSizeFuzzTest",
+    # ":GetTokenIdSizeFuzzTest",
   ]
 }
 

ipc/native/test/fuzztest/c/isatenable_fuzzer/BUILD.gn

@@ -49,7 +49,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":IsATEnableFuzzTest",
+    # ":IsATEnableFuzzTest",
   ]
 }
 

ipc/native/test/fuzztest/c/isfeatureack_fuzzer/BUILD.gn

@@ -50,7 +50,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":IsFeatureAckFuzzTest",
+    # ":IsFeatureAckFuzzTest",
   ]
 }
 

ipc/native/test/fuzztest/c/setfeaturetransdata_fuzzer/BUILD.gn

@@ -50,7 +50,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":SetFeatureTransDataFuzzTest",
+    # ":SetFeatureTransDataFuzzTest",
   ]
 }
 

ipc/native/test/fuzztest/core/bufferobject_fuzzer/BUILD.gn

@@ -52,7 +52,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":BufferObjectFuzzTest",
+    # ":BufferObjectFuzzTest",
   ]
 }
 

services/dbinder/test/fuzztest/closedatabussession_fuzzer/BUILD.gn

@@ -49,7 +49,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":CloseDatabusSessionFuzzTest",
+    # ":CloseDatabusSessionFuzzTest",
   ]
 }
 ###############################################################################

services/dbinder/test/fuzztest/dbinderservice_fuzzer/BUILD.gn

@@ -43,7 +43,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":DBinderServiceFuzzTest",
+    # ":DBinderServiceFuzzTest",
   ]
 }
 ###############################################################################

services/dbinder/test/fuzztest/detachproxyobject_fuzzer/BUILD.gn

@@ -46,7 +46,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":DetachProxyObjectFuzzTest",
+    # ":DetachProxyObjectFuzzTest",
   ]
 }
 ###############################################################################

services/dbinder/test/fuzztest/loadsystemabilitycomplete_fuzzer/BUILD.gn

@@ -45,7 +45,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":LoadSystemAbilityCompleteFuzzTest",
+    # ":LoadSystemAbilityCompleteFuzzTest",
   ]
 }
 ###############################################################################

services/dbinder/test/fuzztest/noticedevicedie_fuzzer/BUILD.gn

@@ -43,7 +43,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":NoticeDeviceDieFuzzTest",
+    # ":NoticeDeviceDieFuzzTest",
   ]
 }
 ###############################################################################

services/dbinder/test/fuzztest/noticeservicedie_fuzzer/BUILD.gn

@@ -43,7 +43,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":NoticeServiceDieFuzzTest",
+    # ":NoticeServiceDieFuzzTest",
   ]
 }
 ###############################################################################

services/dbinder/test/fuzztest/onbytesreceived_fuzzer/BUILD.gn

@@ -46,7 +46,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":OnBytesReceivedFuzzTest",
+    # ":OnBytesReceivedFuzzTest",
   ]
 }
 ###############################################################################

services/dbinder/test/fuzztest/senddatatoremote_fuzzer/BUILD.gn

@@ -46,7 +46,7 @@ group("fuzztest") {
   deps = []
   deps += [
     # deps file
-    #":SendDataToRemoteFuzzTest",
+    # ":SendDataToRemoteFuzzTest",
   ]
 }
 ###############################################################################