diff --git a/core/common/dfx/interface/include/softbus_log.h b/core/common/dfx/interface/include/softbus_log.h index 3866a9b0c00f83e0f7f57bebb8125d40c715cb00..4c40a5f273215ae92a2d1582f969c117bf94a683 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( \ 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 fdb7866be16f793706ba47800c24cb47798a6cca..36f44125eee0b502ca2ac7e25825a389dad5459f 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 2bdf9d2c68e9c501080922cdf1720e0c23d090f5..606ea6d54db4499d53348a11eda6aa48c7f166d0 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; }