openharmony/communication_dsoftbus
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_dsoftbus synced 2024-11-27 19:00:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

judge malloc return value

Browse Source 
Signed-off-by: w00644978 <wudy062379@126.com>
This commit is contained in:
w00644978 2022-11-28 20:11:56 +08:00
parent ea911d9f23
commit f18f3dbb89
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
adapter/common/dfx/softbus_adapter_hisysevent.cpp
View File

@ -67,11 +67,14 @@ static int32_t ConvertEventParam(SoftBusEvtParam *srcParam, HiSysEventParam *dst
break;
case SOFTBUS_EVT_PARAMTYPE_STRING:
dstParam->t = HISYSEVENT_STRING;
dstParam->v.s = (char *)SoftBusMalloc(sizeof(char) * strlen(srcParam->paramValue.str) + 1);
if (strcpy_s(dstParam->v.s, strlen(srcParam->paramValue.str) + 1,
srcParam->paramValue.str) != EOK) {
dstParam->v.s = (char *)SoftBusCalloc(sizeof(char) * SOFTBUS_HISYSEVT_PARAM_LEN);
if (dstParam->v.s == NULL) {
HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertEventParam: SoftBusMalloc fail");
return SOFTBUS_ERR;
}
if (strcpy_s(dstParam->v.s, SOFTBUS_HISYSEVT_PARAM_LEN, srcParam->paramValue.str) != EOK) {
SoftBusFree(dstParam->v.s);
HILOG_ERROR(SOFTBUS_HILOG_ID, "copy string var fail");
HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertEventParam:copy string var fail");
return SOFTBUS_ERR;
}
break;
@ -93,7 +96,10 @@ static int32_t ConvertMsgToHiSysEvent(SoftBusEvtReportMsg *msg)
HILOG_ERROR(SOFTBUS_HILOG_ID, "copy param fail");
return SOFTBUS_ERR;
}
ConvertEventParam(&msg->paramArray[i], &g_dstParam[i]);
if (ConvertEventParam(&msg->paramArray[i], &g_dstParam[i]) != SOFTBUS_OK) {
HILOG_ERROR(SOFTBUS_HILOG_ID, "ConvertMsgToHiSysEvent:convert param fail");
return SOFTBUS_ERR;
}
}
return SOFTBUS_OK;
}
@ -105,7 +111,7 @@ static void HiSysEventParamDeInit(uint32_t size)
SoftBusFree(g_dstParam[i].v.s);
g_dstParam[i].v.s = NULL;
}
}
}
}
static HiSysEventEventType ConvertMsgType(SoftBusEvtType type)