openharmony/developtools_syscap_codec
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_syscap_codec.git synced 2026-08-27 02:11:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

!446 修改安全告警

Browse Source 
Merge pull request !446 from csliutt/master
This commit is contained in:
openharmony_ci
2024-05-29 12:02:05 +00:00
committed by Gitee
parent 87c247b867 4929258829
commit c99dac0f39
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/syscap_interface.c
-4
View File
@@ -516,10 +516,6 @@ char *DecodeRpcidToStringFormat(const char *inputFile)
}
PartSysCapAndOutBuffer(freeAfterDecodeRpcidInfo, outBuffer, priSyscapArray, sysCapArray);
free(priSyscapArray);
priSyscapArray = NULL;
return FreeAfterDecodeRpcidToString(freeAfterDecodeRpcidInfo, FREE_MALLOC_PRISYSCAP_AFTER_DECODE_RPCID, outBuffer);
}
src/syscap_tool.c
+6 -6
View File
@@ -141,10 +141,9 @@ int32_t RPCIDEncode(char *inputFile, char *outputPath)
gJsonObjectSysCap.cjsonObjectRoot = NULL;
gJsonObjectSysCap.sysCapPtr = NULL;
int32_t ret = GetFileContext(inputFile, &contextBuffer, &bufferLen);
if (ret != 0) {
if (GetFileContext(inputFile, &contextBuffer, &bufferLen) != 0) {
PRINT_ERR("GetFileContext failed, input file : %s\n", inputFile);
return ret;
return -1;
}
gJsonObjectSysCap.cjsonObjectRoot = cJSON_ParseWithLength(contextBuffer, bufferLen);
@@ -161,7 +160,7 @@ int32_t RPCIDEncode(char *inputFile, char *outputPath)
FREE_CONTEXT_OUT_RPCID_ENCODE, -1);
}
ret = cJSON_GetArraySize(gJsonObjectSysCap.sysCapPtr);
int32_t ret = cJSON_GetArraySize(gJsonObjectSysCap.sysCapPtr);
if (ret < 0) {
PRINT_ERR("get \"syscap\" array size failed\n");
return FreeAfterRPCIDEncode(gJsonObjectSysCap.cjsonObjectRoot, NULL, contextBuffer,
@@ -182,9 +181,10 @@ int32_t RPCIDEncode(char *inputFile, char *outputPath)
if (FillOsCapLength(convertedBuffer, contextBuffer, gJsonObjectSysCap, sysCapSize, ret) == -1) {
return FreeAfterRPCIDEncode(gJsonObjectSysCap.cjsonObjectRoot, convertedBuffer, contextBuffer,
FREE_CONVERT_OUT_RPCID_ENCODE, ret);
FREE_CONVERT_OUT_RPCID_ENCODE, -1);
}
if (ConvertedContextSaveAsFile(outputPath, "rpcid.sc", convertedBuffer, convertedBufLen) != 0) {
ret = ConvertedContextSaveAsFile(outputPath, "rpcid.sc", convertedBuffer, convertedBufLen);
if (ret != 0) {
PRINT_ERR("ConvertedContextSaveAsFile failed, outputPath:%s, filename:rpcid.sc\n", outputPath);
}
return FreeAfterRPCIDEncode(gJsonObjectSysCap.cjsonObjectRoot, convertedBuffer, contextBuffer,