diff --git a/interfaces/inner_api/syscap_interface.c b/interfaces/inner_api/syscap_interface.c index 34cb6f0241ea71b0ff48cb5d8fd9ddc720a2d9e4..c70d5608d3431c4ab165bca70c765823584e4869 100644 --- a/interfaces/inner_api/syscap_interface.c +++ b/interfaces/inner_api/syscap_interface.c @@ -249,6 +249,7 @@ bool DecodePrivateSyscap(char *input, char (**output)[SINGLE_SYSCAP_LEN], int *o *bufferPos = '\0'; if (sprintf_s(*outputArray, SINGLE_SYSCAP_LEN, "SystemCapability.%s", buffer) == -1) { free(outputArray); + outputArray = NULL; return false; } bufferPos = buffer; diff --git a/napi/napi_query_syscap.cpp b/napi/napi_query_syscap.cpp index 6f75b2b589dd21fddeb8cfd0355afeae1cea6579..ca6a9580017df971f4ab57585f0727af90ebe64d 100644 --- a/napi/napi_query_syscap.cpp +++ b/napi/napi_query_syscap.cpp @@ -172,6 +172,7 @@ napi_value QuerySystemCapability(napi_env env, napi_callback_info info) } else { napi_get_undefined(env, &result); } + napi_value resource = nullptr; napi_create_string_utf8(env, "napi_value QuerySystemCapability", NAPI_AUTO_LENGTH, &resource); diff --git a/src/create_pcid.c b/src/create_pcid.c index 6f9a3736903c72b341bd90ee583dfeba32d14a61..8a2f14c7567649c29312d0a1e7f5a742f77b4a93 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -909,5 +909,6 @@ int32_t EncodePcidscToString(char *inputFile, char *outDirPath) } // output + freePcidInfo.priSyscapFull = NULL; return GetEncodePCIDOut(priSyscapCount, privateSyscapLen, mainSyscap, freePcidInfo, ret); } \ No newline at end of file diff --git a/src/syscap_tool.c b/src/syscap_tool.c index e7b1314d143f6dc2bb476e1686177e4599bd6f90..26198ba15cf72ff99cb75ec38b42c62d1a032512 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -352,7 +352,6 @@ static int32_t OutputSetMemAndPrintToFile(struct FreeAfterEncodeRpcidscInfo free cJSON *cJsonTemp = NULL; uint16_t indexPri = 0; int32_t ret = 0; - freeAfterEncodeRpcidscInfo.type = FREE_MALLOC_OSSYSCAP_AFTER_RPCIDSC; (void)memset_s(freeAfterEncodeRpcidscInfo.osSysCapIndex, sizeof(uint16_t) * sysCapArraySize, 0, sizeof(uint16_t) * sysCapArraySize); @@ -494,6 +493,7 @@ int32_t EncodeRpcidscToString(char *inputFile, char *outDirPath) if (freeAfterEncodeRpcidscInfo.flag == 1) { return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, freeAfterEncodeRpcidscInfo.type, ret); } + freeAfterEncodeRpcidscInfo.osSysCapIndex = NULL; return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, FREE_OUTBUFFER_AFTER_RPCIDSC, ret); }