From e0afbe5dc1cee21c9f468014276f669620ffcf6c Mon Sep 17 00:00:00 2001 From: yudechen Date: Wed, 18 May 2022 11:24:00 +0800 Subject: [PATCH] fixed 1e2351c from https://gitee.com/yudechen/developtools_syscap_codec/pulls/36 fix for codex. Signed-off-by: yudechen Change-Id: Ia020400dffc02e7944be21dfbdfbb1f789991b77 --- src/syscap_tool.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/syscap_tool.c b/src/syscap_tool.c index 4874ada..f6a89ee 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -126,8 +126,8 @@ static int32_t ConvertedContextSaveAsFile(char *outDirPath, char *filename, char return -1; } - ret = fwrite(convertedBuffer, bufferLen, 1, fp); - if (ret != 1) { + size_t retFwrite = fwrite(convertedBuffer, bufferLen, 1, fp); + if (retFwrite != 1) { PRINT_ERR("can`t write file(%s),errno = %d\n", fileFullPath, errno); (void)fclose(fp); return -1; @@ -221,7 +221,7 @@ int32_t PCIDEncode(char *inputFile, char *outDirPath) cjsonObjectPtr = cJSON_GetObjectItem(cjsonObjectRoot, "system_type"); if (cjsonObjectPtr == NULL || !cJSON_IsString(cjsonObjectPtr)) { - PRINT_ERR("get \"system_type\" failed, cjsonObjectPtr = %p\n", cjsonObjectPtr); + PRINT_ERR("get \"system_type\" failed.\n"); ret = -1; goto FREE_CONVERT_OUT; } @@ -474,7 +474,7 @@ int32_t PCIDDecode(char *inputFile, char *outDirPath) goto FREE_SYSCAP_OUT; } - for (int32_t i = 0; i < (sysCapLength / SINGLE_FEAT_LENGTH); i++) { + for (uint32_t i = 0; i < (sysCapLength / SINGLE_FEAT_LENGTH); i++) { if (*(privateCapArrayPtr + (i + 1) * SINGLE_FEAT_LENGTH - 1) != '\0') { PRINT_ERR("prase file failed, format is invalid, input file : %s\n", inputFile); ret = -1; @@ -610,6 +610,11 @@ int32_t RPCIDEncode(char *inputFile, char *outDirPath) convertedBufLen += (2 * sizeof(uint16_t) + sysCapSize * SINGLE_FEAT_LENGTH); convertedBuffer = (char *)malloc(convertedBufLen); + if (convertedBuffer == NULL) { + PRINT_ERR("malloc failed\n"); + ret = -1; + goto FREE_CONTEXT_OUT; + } (void)memset_s(convertedBuffer, convertedBufLen, 0, convertedBufLen); headPtr = (RPCIDHead *)convertedBuffer; -- Gitee