From 498f7e48b576fae6ad5e362494c43298fb57b554 Mon Sep 17 00:00:00 2001 From: liuqian_herb <704938153@qq.com> Date: Fri, 10 May 2024 20:43:34 +0800 Subject: [PATCH] =?UTF-8?q?0510=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuqian_herb <704938153@qq.com> --- frameworks/inner/ipc/parcel/bluetooth_bt_uuid.cpp | 14 ++++++++------ .../napi/src/socket/napi_bluetooth_spp_client.cpp | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/frameworks/inner/ipc/parcel/bluetooth_bt_uuid.cpp b/frameworks/inner/ipc/parcel/bluetooth_bt_uuid.cpp index c7aa84f7..697db1f1 100644 --- a/frameworks/inner/ipc/parcel/bluetooth_bt_uuid.cpp +++ b/frameworks/inner/ipc/parcel/bluetooth_bt_uuid.cpp @@ -22,14 +22,16 @@ namespace Bluetooth { bool BluetoothUuid::Marshalling(Parcel &parcel) const { uint64_t mostSigBits = - ((((uint64_t)uuid_[0]) << EIGHT*7) | (((uint64_t)uuid_[1]) << EIGHT*6) | (((uint64_t)uuid_[2]) << EIGHT*5) | - (((uint64_t)uuid_[3]) << EIGHT*4) | (((uint64_t)uuid_[4]) << EIGHT*3) | (((uint64_t)uuid_[5]) << EIGHT*2) | - (((uint64_t)uuid_[6]) << EIGHT) | uuid_[7]); + (((static_cast(uuid_[0])) << EIGHT * 7) | ((static_cast(uuid_[1])) << EIGHT * 6) | + ((static_cast(uuid_[2])) << EIGHT * 5) | ((static_cast(uuid_[3])) << EIGHT * 4) | + ((static_cast(uuid_[4])) << EIGHT * 3) | ((static_cast(uuid_[5])) << EIGHT * 2) | + ((static_cast(uuid_[6])) << EIGHT) | uuid_[7]); uint64_t leastSigBits = - ((((uint64_t)uuid_[8]) << EIGHT*7) | (((uint64_t)uuid_[9]) << EIGHT*6) | (((uint64_t)uuid_[10]) << EIGHT*5) | - (((uint64_t)uuid_[11]) << EIGHT*4) | (((uint64_t)uuid_[12]) << EIGHT*3) | - (((uint64_t)uuid_[13]) << EIGHT*2) | (((uint64_t)uuid_[14]) << EIGHT) | uuid_[15]); + (((static_cast(uuid_[8])) << EIGHT * 7) | ((static_cast(uuid_[9])) << EIGHT * 6) | + ((static_cast(uuid_[10])) << EIGHT * 5) | ((static_cast(uuid_[11])) << EIGHT * 4) | + ((static_cast(uuid_[12])) << EIGHT * 3) | ((static_cast(uuid_[13])) << EIGHT * 2) | + ((static_cast(uuid_[14])) << EIGHT) | uuid_[15]); bool ret = parcel.WriteUint64(mostSigBits); if (!ret) { diff --git a/frameworks/js/napi/src/socket/napi_bluetooth_spp_client.cpp b/frameworks/js/napi/src/socket/napi_bluetooth_spp_client.cpp index 41c8471c..50f93166 100644 --- a/frameworks/js/napi/src/socket/napi_bluetooth_spp_client.cpp +++ b/frameworks/js/napi/src/socket/napi_bluetooth_spp_client.cpp @@ -175,6 +175,8 @@ napi_value NapiSppClient::SppConnect(napi_env env, napi_callback_info info) static_cast(callbackInfo), &callbackInfo->asyncWork_); napi_queue_async_work(env, callbackInfo->asyncWork_); + delete callbackInfo; + callbackInfo = nullptr; return NapiGetUndefinedRet(env); } -- Gitee