From 27d4f2a4a0941e4f86aeef8f179bf8880c2f6c9f Mon Sep 17 00:00:00 2001 From: zhengpengyue Date: Tue, 20 Aug 2024 15:39:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9mini=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E7=AD=96=E7=95=A5?= =?UTF-8?q?=20=EF=BC=88cherry=20picked=20commit=20from=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/common/dfx/interface/include/softbus_log.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/common/dfx/interface/include/softbus_log.h b/core/common/dfx/interface/include/softbus_log.h index 3866a9b0c..4c40a5f27 100644 --- a/core/common/dfx/interface/include/softbus_log.h +++ b/core/common/dfx/interface/include/softbus_log.h @@ -44,20 +44,24 @@ extern "C" { #define FILE_NAME (__builtin_strrchr("/" __FILE__, '/') + 1) +#if defined(SOFTBUS_LITEOS_M) +#define FORMAT(fmt) "[%{public}s:%{public}d]# " fmt +#else #define FORMAT(fmt) "[%{public}s:%{public}d] %{public}s# " fmt +#endif /* For inner use only */ #if defined(SOFTBUS_LITEOS_M) #define SOFTBUS_LOGF_INNER(label, fmt, ...) \ - HILOG_FATAL(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__) + HILOG_FATAL(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, ##__VA_ARGS__) #define SOFTBUS_LOGE_INNER(label, fmt, ...) \ - HILOG_ERROR(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__) + HILOG_ERROR(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, ##__VA_ARGS__) #define SOFTBUS_LOGW_INNER(label, fmt, ...) \ - HILOG_WARN(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__) + HILOG_WARN(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, ##__VA_ARGS__) #define SOFTBUS_LOGI_INNER(label, fmt, ...) \ - HILOG_INFO(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__) + HILOG_INFO(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, ##__VA_ARGS__) #define SOFTBUS_LOGD_INNER(label, fmt, ...) \ - HILOG_DEBUG(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, __FUNCTION__, ##__VA_ARGS__) + HILOG_DEBUG(HILOG_MODULE_SOFTBUS, FORMAT(fmt), FILE_NAME, __LINE__, ##__VA_ARGS__) #elif defined(SOFTBUS_LITEOS_A) #define SOFTBUS_LOG_INNER(level, label, fmt, ...) \ (void)HiLogPrint( \ -- Gitee From 9202fe35d96e33a6057026ca8d3f58b0fa037ff9 Mon Sep 17 00:00:00 2001 From: zhengpengyue Date: Tue, 20 Aug 2024 10:45:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=B3=84=E6=BC=8F=E5=8F=8A=E7=A9=BA=E6=8C=87=E9=92=88=E8=A7=A3?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98=20=EF=BC=88cherry=20picked?= =?UTF-8?q?=20commit=20from=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proxy/src/client_trans_proxy_file_manager.c | 2 +- .../proxy/src/client_trans_proxy_manager.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c index fdb7866be..36f44125e 100644 --- a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c +++ b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_file_manager.c @@ -1737,11 +1737,11 @@ static int32_t CreateFileFromFrame(int32_t sessionId, int32_t channelId, const F } else if (recipient->fileListener.recvListener.OnReceiveFileStarted != NULL) { recipient->fileListener.recvListener.OnReceiveFileStarted(sessionId, file->filePath, 1); } - ReleaseRecipientRef(recipient); SoftBusFree(file); if (recipient->crc == APP_INFO_FILE_FEATURES_SUPPORT) { (void)SendFileTransResult(channelId, 0, SOFTBUS_OK, IS_RECV_RESULT); } + ReleaseRecipientRef(recipient); return SOFTBUS_OK; EXIT_ERR: SoftBusFree(file); diff --git a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c index 2bdf9d2c6..606ea6d54 100644 --- a/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c +++ b/sdk/transmission/trans_channel/proxy/src/client_trans_proxy_manager.c @@ -270,9 +270,18 @@ int32_t ClientTransProxyOnChannelOpened(const char *sessionName, const ChannelIn TRANS_LOGW(TRANS_SDK, "invalid param."); return SOFTBUS_INVALID_PARAM; } - int ret = ClientTransProxyAddChannelInfo(ClientTransProxyCreateChannelInfo(channel)); + + ClientProxyChannelInfo *info = ClientTransProxyCreateChannelInfo(channel); + if (info == NULL) { + TRANS_LOGE(TRANS_SDK, "create channel info fail, channelId=%{public}d", channel->channelId); + return SOFTBUS_MEM_ERR; + } + + int32_t ret = ClientTransProxyAddChannelInfo(info); if (ret != SOFTBUS_OK) { - TRANS_LOGE(TRANS_SDK, "ClientTransProxyAddChannelInfo fail"); + TRANS_LOGE(TRANS_SDK, "ClientTransProxyAddChannelInfo fail channelId=%{public}d", channel->channelId); + (void)memset_s(info->detail.sessionKey, SESSION_KEY_LENGTH, 0, SESSION_KEY_LENGTH); + SoftBusFree(info); return ret; } -- Gitee