From d42f6872f84b0c96612023f4485f9a5c2d5dbc86 Mon Sep 17 00:00:00 2001 From: wuhb Date: Mon, 9 May 2022 15:13:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bundle.json=20=E4=B8=AD=20syscap=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=A7=84=E8=8C=83=20Signed-off-by:?= =?UTF-8?q?=20wuhb=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuhb --- include/syscap_define.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 4c2b4e1..f9da09c 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -275,7 +275,7 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.Security.DeviceAuth", SECURITY_DEVICEAUTH}, {"SystemCapability.Security.DeviceSecurityLevel", SECURITY_DEVICESECURITYLEVEL}, {"SystemCapability.Security.Huks", SECURITY_HUKS}, - {"SystemCapability.Sensors.Medical_sensor", SENSORS_MEDICAL_SENSOR}, + {"SystemCapability.Sensors.Medical.Sensor", SENSORS_MEDICAL_SENSOR}, {"SystemCapability.Sensors.MiscDevice", SENSORS_MISCDEVICE}, {"SystemCapability.Sensors.Sensor", SENSORS_SENSOR}, {"SystemCapability.Sensors.Sensor_lite", SENSORS_SENSOR_LITE}, @@ -299,4 +299,4 @@ static SyscapWithNum arraySyscap[] = { {"SystemCapability.UserIAM.UserIdm", USERIAM_USERIDM} }; -#endif // _SYSCAP_DEFINE_H \ No newline at end of file +#endif // _SYSCAP_DEFINE_H From 995529d0e3a0ab530a99540b52e91d2462489362 Mon Sep 17 00:00:00 2001 From: yudechen Date: Wed, 18 May 2022 11:24:00 +0800 Subject: [PATCH 2/2] 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 74c9882..bf681a0 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -130,8 +130,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; @@ -229,7 +229,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; } @@ -482,7 +482,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; @@ -617,6 +617,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;