diff --git a/frameworks/ans/core/src/ans_image_util.cpp b/frameworks/ans/core/src/ans_image_util.cpp index 998c72998fc5a67580c0a63901cd3c3ddd4b0350..4923318250d4da8fec68eb38b919b572c669e3a2 100644 --- a/frameworks/ans/core/src/ans_image_util.cpp +++ b/frameworks/ans/core/src/ans_image_util.cpp @@ -196,15 +196,17 @@ std::string AnsImageUtil::HexToBin(const std::string &strHex) uint8_t cTemp = 0; for (size_t j = 0; j < TWO_TIMES; j++) { char cCur = strHex[TWO_TIMES * i + j]; + uint8_t value = cTemp << SHIFT_FOUR; if (cCur >= '0' && cCur <= '9') { - cTemp = (cTemp << SHIFT_FOUR) + static_cast(cCur - '0'); + value = value + static_cast(cCur - '0'); } else if (cCur >= 'a' && cCur <= 'f') { - cTemp = (cTemp << SHIFT_FOUR) + static_cast(cCur - 'a' + NUM_TEN); + value = value + static_cast(cCur - 'a' + NUM_TEN); } else if (cCur >= 'A' && cCur <= 'F') { - cTemp = (cTemp << SHIFT_FOUR) + static_cast(cCur - 'A' + NUM_TEN); + value = value + static_cast(cCur - 'A' + NUM_TEN); } else { return {}; } + cTemp = static_cast(value); } strBin[i] = cTemp; } diff --git a/interfaces/kits/napi/ans/src/common.cpp b/interfaces/kits/napi/ans/src/common.cpp index 5441910bbf29fdda330394b456655ffaa09736c2..d2d75ebc8a23b0628d51e69e1389a4ecd40fd22e 100644 --- a/interfaces/kits/napi/ans/src/common.cpp +++ b/interfaces/kits/napi/ans/src/common.cpp @@ -3205,7 +3205,6 @@ napi_value Common::GetConversationalMessageOtherInfo(const napi_env &env, const NAPI_ASSERT(env, valuetype == napi_string, "Wrong argument type. String expected."); NAPI_CALL(env, napi_get_value_string_utf8(env, uriResult, str, STR_MAX_SIZE - 1, &strLen)); uri = str; - ANS_LOGI("conversationalMessage::uri = %{public}s", str); } std::shared_ptr uriPtr = std::make_shared(uri); @@ -3274,7 +3273,6 @@ napi_value Common::GetMessageUserByString(const napi_env &env, const napi_value NAPI_CALL(env, napi_get_value_string_utf8(env, uriResult, str, STR_MAX_SIZE - 1, &strLen)); Uri uri(str); messageUser.SetUri(uri); - ANS_LOGI("MessageUser::uri = %{public}s", str); return NapiGetNull(env); } diff --git a/interfaces/kits/napi/ans/src/subscribe.cpp b/interfaces/kits/napi/ans/src/subscribe.cpp index 5d2f0f29a6d30b7eb42123782caa12157a448512..585679aa45cb3bfc39c724ece21a2ce4efb6cc95 100644 --- a/interfaces/kits/napi/ans/src/subscribe.cpp +++ b/interfaces/kits/napi/ans/src/subscribe.cpp @@ -1211,18 +1211,20 @@ napi_value Subscribe(napi_env env, napi_callback_info info) return; } AsyncCallbackInfoSubscribe *asynccallbackinfo = (AsyncCallbackInfoSubscribe *)data; + if (!asynccallbackinfo) { + ANS_LOGE("Invalid asynccallbackinfo!"); + return; + } Common::ReturnCallbackPromise(env, asynccallbackinfo->info, Common::NapiGetNull(env)); if (asynccallbackinfo->info.callback != nullptr) { napi_delete_reference(env, asynccallbackinfo->info.callback); } - napi_delete_async_work(env, asynccallbackinfo->asyncWork); - if (asynccallbackinfo) { - delete asynccallbackinfo; - asynccallbackinfo = nullptr; - } + + delete asynccallbackinfo; + asynccallbackinfo = nullptr; }, (void *)asynccallbackinfo, &asynccallbackinfo->asyncWork);