From 375a39c906da7483ac66696aa3ccaf4b2fa70ff2 Mon Sep 17 00:00:00 2001 From: zhang-junxi66 Date: Mon, 23 May 2022 11:26:59 +0800 Subject: [PATCH 1/5] Signed-off-by: zhang-junxi66 changed to commited: --- .../js/napi/system_time/src/js_systemtime.cpp | 20 +++++++++++-------- .../js/napi/system_timer/src/system_timer.cpp | 20 +++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp index d31c0fa..26ada7e 100644 --- a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp +++ b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp @@ -339,6 +339,9 @@ napi_value JSSystemTimeGetCurrentTime(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void* data) { AsyncContext* asyncContext = (AsyncContext*)data; + if(asyncContext == nullptr) { + return; + } if (asyncContext->time < 0) { } TimeCallbackPromiseInfo info; @@ -350,10 +353,9 @@ napi_value JSSystemTimeGetCurrentTime(napi_env env, napi_callback_info info) napi_create_int64(env, asyncContext->time, &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - if (asyncContext) { - delete asyncContext; - asyncContext = nullptr; - } + + delete asyncContext; + asyncContext = nullptr; }, (void*)asyncContext, &asyncContext->work); @@ -571,6 +573,9 @@ napi_value JSSystemTimeGetTimeZone(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void* data) { AsyncContext* asyncContext = (AsyncContext*)data; + if (asyncContext == nullptr) { + return; + } if (asyncContext->timeZone == "") { asyncContext->errorCode = ERROR; } @@ -583,10 +588,9 @@ napi_value JSSystemTimeGetTimeZone(napi_env env, napi_callback_info info) napi_create_string_utf8(env, asyncContext->timeZone.c_str(), asyncContext->timeZone.length(), &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - if (asyncContext) { - delete asyncContext; - asyncContext = nullptr; - } + + delete asyncContext; + asyncContext = nullptr; }, (void*)asyncContext, &asyncContext->work); diff --git a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp index f2e73b6..5c07bef 100644 --- a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp +++ b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp @@ -488,6 +488,9 @@ napi_value StartTimer(napi_env env, napi_callback_info info) [](napi_env env, napi_status status, void *data) { AsyncCallbackInfoStart *asynccallbackinfo = (AsyncCallbackInfoStart *)data; + if(asynccallbackinfo == nullptr) { + return; + } if (!asynccallbackinfo->isOK) { asynccallbackinfo->errorCode = ERROR; } @@ -503,10 +506,9 @@ napi_value StartTimer(napi_env env, napi_callback_info info) ReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asynccallbackinfo->asyncWork); - if (asynccallbackinfo) { - delete asynccallbackinfo; - asynccallbackinfo = nullptr; - } + + delete asynccallbackinfo; + asynccallbackinfo = nullptr; }, (void *)asynccallbackinfo, &asynccallbackinfo->asyncWork); @@ -702,6 +704,9 @@ napi_value DestroyTimer(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void *data) { AsyncCallbackInfoDestroy *asynccallbackinfo = (AsyncCallbackInfoDestroy *)data; + if(asynccallbackinfo == nullptr) { + return; + } if (asynccallbackinfo->isOK) { for (auto it = asyncCallbackInfoCreateInfo.begin(); it != asyncCallbackInfoCreateInfo.end(); it++) { @@ -726,10 +731,9 @@ napi_value DestroyTimer(napi_env env, napi_callback_info info) ReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asynccallbackinfo->asyncWork); - if (asynccallbackinfo) { - delete asynccallbackinfo; - asynccallbackinfo = nullptr; - } + + delete asynccallbackinfo; + asynccallbackinfo = nullptr; }, (void *)asynccallbackinfo, &asynccallbackinfo->asyncWork); From 599074d1f204e5e31b22987c2c6385d9149a1f09 Mon Sep 17 00:00:00 2001 From: zhang-junxi66 Date: Mon, 23 May 2022 16:01:40 +0800 Subject: [PATCH 2/5] Signed-off-by: zhang-junxi66 Changes to commited --- interfaces/kits/js/napi/system_time/src/js_systemtime.cpp | 2 +- interfaces/kits/js/napi/system_timer/src/system_timer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp index 26ada7e..1ae9088 100644 --- a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp +++ b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp @@ -339,7 +339,7 @@ napi_value JSSystemTimeGetCurrentTime(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void* data) { AsyncContext* asyncContext = (AsyncContext*)data; - if(asyncContext == nullptr) { + if (asyncContext == nullptr) { return; } if (asyncContext->time < 0) { diff --git a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp index 5c07bef..8b7ada5 100644 --- a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp +++ b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp @@ -488,7 +488,7 @@ napi_value StartTimer(napi_env env, napi_callback_info info) [](napi_env env, napi_status status, void *data) { AsyncCallbackInfoStart *asynccallbackinfo = (AsyncCallbackInfoStart *)data; - if(asynccallbackinfo == nullptr) { + if (asynccallbackinfo == nullptr) { return; } if (!asynccallbackinfo->isOK) { @@ -704,7 +704,7 @@ napi_value DestroyTimer(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void *data) { AsyncCallbackInfoDestroy *asynccallbackinfo = (AsyncCallbackInfoDestroy *)data; - if(asynccallbackinfo == nullptr) { + if (asynccallbackinfo == nullptr) { return; } From dd5ef24eb7a562dcdea3420082abd225192e2aa2 Mon Sep 17 00:00:00 2001 From: zhang-junxi66 Date: Mon, 23 May 2022 17:28:55 +0800 Subject: [PATCH 3/5] Signed-off-by: zhang-junxi66 Changes to commited: --- .../js/napi/system_time/src/js_systemtime.cpp | 42 ++++++++++++------- .../js/napi/system_timer/src/system_timer.cpp | 8 ++-- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp index 1ae9088..ea39d0e 100644 --- a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp +++ b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp @@ -169,6 +169,10 @@ napi_value JSSystemTimeSetTime(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void *data) { AsyncContext *asyncContext = (AsyncContext*)data; + if (asyncContext == nullptr) { + return; + } + if (!asyncContext->isOK) { asyncContext->errorCode = ERROR; } @@ -181,10 +185,8 @@ napi_value JSSystemTimeSetTime(napi_env env, napi_callback_info info) napi_get_null(env, &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - if (asyncContext) { - delete asyncContext; - asyncContext = nullptr; - } + delete asyncContext; + asyncContext = nullptr; }, (void*)asyncContext, &asyncContext->work); @@ -249,6 +251,9 @@ napi_value JSSystemTimeSetTimeZone(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void *data) { AsyncContext *asyncContext = (AsyncContext*)data; + if (asyncContext == nullptr) { + return; + } if (!asyncContext->isOK) { asyncContext->errorCode = ERROR; } @@ -261,9 +266,8 @@ napi_value JSSystemTimeSetTimeZone(napi_env env, napi_callback_info info) napi_get_null(env, &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - if (asyncContext) { - delete asyncContext; - asyncContext = nullptr; + delete asyncContext; + asyncContext = nullptr; } }, (void*)asyncContext, @@ -400,6 +404,9 @@ napi_value JSSystemTimeGetRealActiveTime(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void* data) { AsyncContext* asyncContext = (AsyncContext*)data; + if (asyncContext == nullptr) { + return; + } if (asyncContext->time < 0) { asyncContext->errorCode = ERROR; } @@ -412,9 +419,8 @@ napi_value JSSystemTimeGetRealActiveTime(napi_env env, napi_callback_info info) napi_create_int64(env, asyncContext->time, &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - if (asyncContext) { - delete asyncContext; - asyncContext = nullptr; + delete asyncContext; + asyncContext = nullptr; } }, (void*)asyncContext, @@ -460,6 +466,9 @@ napi_value JSSystemTimeGetRealTime(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void* data) { AsyncContext* asyncContext = (AsyncContext*)data; + if (asyncContext == nullptr) { + return; + } if (asyncContext->time < 0) { asyncContext->errorCode = ERROR; } @@ -472,9 +481,8 @@ napi_value JSSystemTimeGetRealTime(napi_env env, napi_callback_info info) napi_create_int64(env, asyncContext->time, &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - if (asyncContext) { - delete asyncContext; - asyncContext = nullptr; + delete asyncContext; + asyncContext = nullptr; } }, (void*)asyncContext, @@ -514,6 +522,9 @@ napi_value JSSystemTimeGetDate(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void* data) { AsyncContext* asyncContext = (AsyncContext*)data; + if (asyncContext == nullptr) { + return; + } if (asyncContext->time < 0) { asyncContext->errorCode = ERROR; } @@ -530,9 +541,8 @@ napi_value JSSystemTimeGetDate(napi_env env, napi_callback_info info) napi_run_script(env, script, &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - if (asyncContext) { - delete asyncContext; - asyncContext = nullptr; + delete asyncContext; + asyncContext = nullptr; } }, (void*)asyncContext, diff --git a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp index 8b7ada5..264ac2a 100644 --- a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp +++ b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp @@ -599,6 +599,9 @@ napi_value StopTimer(napi_env env, napi_callback_info info) }, [](napi_env env, napi_status status, void *data) { AsyncCallbackInfoStop *asynccallbackinfo = (AsyncCallbackInfoStop *)data; + if (asynccallbackinfo == nullptr) { + return; + } if (!asynccallbackinfo->isOK) { asynccallbackinfo->errorCode = ERROR; @@ -615,9 +618,8 @@ napi_value StopTimer(napi_env env, napi_callback_info info) ReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asynccallbackinfo->asyncWork); - if (asynccallbackinfo) { - delete asynccallbackinfo; - asynccallbackinfo = nullptr; + delete asynccallbackinfo; + asynccallbackinfo = nullptr; } }, (void *)asynccallbackinfo, From 9b593fa70e3fdda79dd38d370a2b0aaf2ce25918 Mon Sep 17 00:00:00 2001 From: zhang-junxi66 Date: Mon, 23 May 2022 17:56:06 +0800 Subject: [PATCH 4/5] Signed-off-by: zhang-junxi66 Changes to commited: --- interfaces/kits/js/napi/system_time/src/js_systemtime.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp index ea39d0e..4eace67 100644 --- a/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp +++ b/interfaces/kits/js/napi/system_time/src/js_systemtime.cpp @@ -268,7 +268,6 @@ napi_value JSSystemTimeSetTimeZone(napi_env env, napi_callback_info info) napi_delete_async_work(env, asyncContext->work); delete asyncContext; asyncContext = nullptr; - } }, (void*)asyncContext, &asyncContext->work); @@ -357,7 +356,6 @@ napi_value JSSystemTimeGetCurrentTime(napi_env env, napi_callback_info info) napi_create_int64(env, asyncContext->time, &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - delete asyncContext; asyncContext = nullptr; }, @@ -421,7 +419,6 @@ napi_value JSSystemTimeGetRealActiveTime(napi_env env, napi_callback_info info) napi_delete_async_work(env, asyncContext->work); delete asyncContext; asyncContext = nullptr; - } }, (void*)asyncContext, &asyncContext->work); @@ -483,7 +480,6 @@ napi_value JSSystemTimeGetRealTime(napi_env env, napi_callback_info info) napi_delete_async_work(env, asyncContext->work); delete asyncContext; asyncContext = nullptr; - } }, (void*)asyncContext, &asyncContext->work); @@ -543,7 +539,6 @@ napi_value JSSystemTimeGetDate(napi_env env, napi_callback_info info) napi_delete_async_work(env, asyncContext->work); delete asyncContext; asyncContext = nullptr; - } }, (void*)asyncContext, &asyncContext->work); @@ -598,7 +593,6 @@ napi_value JSSystemTimeGetTimeZone(napi_env env, napi_callback_info info) napi_create_string_utf8(env, asyncContext->timeZone.c_str(), asyncContext->timeZone.length(), &result); TimeReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asyncContext->work); - delete asyncContext; asyncContext = nullptr; }, From 7dfe93c2e9e728ca39770ccb71f62b45d758c51b Mon Sep 17 00:00:00 2001 From: zhang-junxi66 Date: Mon, 23 May 2022 18:16:34 +0800 Subject: [PATCH 5/5] Signed-off-by: zhang-junxi66 Changes to commited: --- interfaces/kits/js/napi/system_timer/src/system_timer.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp index 264ac2a..acdb950 100644 --- a/interfaces/kits/js/napi/system_timer/src/system_timer.cpp +++ b/interfaces/kits/js/napi/system_timer/src/system_timer.cpp @@ -506,7 +506,6 @@ napi_value StartTimer(napi_env env, napi_callback_info info) ReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asynccallbackinfo->asyncWork); - delete asynccallbackinfo; asynccallbackinfo = nullptr; }, @@ -620,7 +619,6 @@ napi_value StopTimer(napi_env env, napi_callback_info info) napi_delete_async_work(env, asynccallbackinfo->asyncWork); delete asynccallbackinfo; asynccallbackinfo = nullptr; - } }, (void *)asynccallbackinfo, &asynccallbackinfo->asyncWork); @@ -733,7 +731,6 @@ napi_value DestroyTimer(napi_env env, napi_callback_info info) ReturnCallbackPromise(env, info, result); napi_delete_async_work(env, asynccallbackinfo->asyncWork); - delete asynccallbackinfo; asynccallbackinfo = nullptr; },