From 177ed4266b0348e4d41da668b7d605480aa232dc Mon Sep 17 00:00:00 2001 From: HuangHaitao Date: Wed, 23 Apr 2025 03:05:15 +0000 Subject: [PATCH] =?UTF-8?q?Finalize=E6=96=B9=E6=B3=95=E6=8A=A5socket=20fd?= =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: HuangHaitao --- .../js/napi/socket/socket_module/src/socket_module.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frameworks/js/napi/socket/socket_module/src/socket_module.cpp b/frameworks/js/napi/socket/socket_module/src/socket_module.cpp index 0b67ba88a..5622834d3 100644 --- a/frameworks/js/napi/socket/socket_module/src/socket_module.cpp +++ b/frameworks/js/napi/socket/socket_module/src/socket_module.cpp @@ -135,7 +135,9 @@ void Finalize(napi_env, void *data, void *) if (sharedManager != nullptr && *sharedManager != nullptr) { auto manager = *sharedManager; int sock = static_cast(reinterpret_cast(manager->GetData())); - if (sock != -1) { + if (sock == 0) { + NETSTACK_LOGE("manager->GetData() got nullptr, Finalize() called before creating socket?"); + } else if (sock != -1) { SocketExec::SingletonSocketConfig::GetInstance().RemoveServerSocket(sock); close(sock); manager->SetData(reinterpret_cast(-1)); @@ -226,6 +228,7 @@ static bool SetSocket(napi_env env, napi_value thisVal, BaseContext *context, in if (manager == nullptr) { return false; } + NETSTACK_LOGI("SetSocket: %{public}d", sock); manager->SetData(reinterpret_cast(sock)); NapiUtils::SetInt32Property(env, thisVal, KEY_SOCKET_FD, sock); return true; @@ -367,6 +370,7 @@ static bool SetSocketManager(napi_env env, napi_value thisVal, BaseContext *cont if (manager == nullptr) { return false; } + NETSTACK_LOGD("SetSocketManager setData"); manager->SetData(reinterpret_cast(mgr)); NapiUtils::SetInt32Property(env, thisVal, KEY_SOCKET_FD, mgr->sockfd_); return true; -- Gitee