From 9852f491071d4499602bd1b680b722a5ab2a915e Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 15 Apr 2024 08:16:39 +0000 Subject: [PATCH 1/7] update src/syscap_tool.c. Signed-off-by: flying --- src/syscap_tool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/syscap_tool.c b/src/syscap_tool.c index ff4e084..4639159 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -232,7 +232,7 @@ static int32_t ParseRpcidToJson(char *input, uint32_t inputLen, cJSON *rpcidJson cJSON_Delete(sysCapJson); return -1; } - + cJSON_Delete(sysCapJson); return ret; } @@ -263,7 +263,7 @@ int32_t RPCIDDecode(char *inputFile, char *outputPath) PRINT_ERR("ConvertedContextSaveAsFile failed, outputPath:%s, filename:rpcid.json\n", outputPath); goto FREE_RPCID_ROOT; } - + goto FREE_CONTEXT_OUT; FREE_RPCID_ROOT: cJSON_Delete(rpcidRoot); FREE_CONTEXT_OUT: @@ -485,6 +485,7 @@ int32_t EncodeRpcidscToString(char *inputFile, char *outDirPath) freeAfterEncodeRpcidscInfo.osSysCapIndex = (uint16_t *)malloc(sizeof(uint16_t) * sysCapArraySize); if (freeAfterEncodeRpcidscInfo.osSysCapIndex == NULL) { PRINT_ERR("malloc failed.\n"); + free(freeAfterEncodeRpcidscInfo.osSysCapIndex); return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, FREE_WHOLE_SYSCAP_AFTER_RPCIDSC, ret); } -- Gitee From a6eeab1530ee2f00a67610e226d50a3b9eb1be91 Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 15 Apr 2024 08:18:00 +0000 Subject: [PATCH 2/7] update src/main.c. Signed-off-by: flying --- src/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 4cc9e42..8b99dd9 100644 --- a/src/main.c +++ b/src/main.c @@ -126,7 +126,8 @@ int32_t OperateByBitMap(char *const *argv, uint16_t bitMap, char *outputpath) case 0x10E: // 0x10E, -Rdsi inputfile printf("-Rdsi is not support currently.\n"); break; case 0x80: // 0x80, -v - (void)OutputVersion(argv[optind], optind); break; + if optind < 0 || optind >= argc: + (void)OutputVersion(argv[optind], optind); break; default: (void)OutputHelp(); } -- Gitee From 3865037fc0d74bb391122fae0664663874014878 Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 15 Apr 2024 08:43:57 +0000 Subject: [PATCH 3/7] update src/main.c. Signed-off-by: flying --- src/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.c b/src/main.c index 8b99dd9..2284781 100644 --- a/src/main.c +++ b/src/main.c @@ -128,6 +128,8 @@ int32_t OperateByBitMap(char *const *argv, uint16_t bitMap, char *outputpath) case 0x80: // 0x80, -v if optind < 0 || optind >= argc: (void)OutputVersion(argv[optind], optind); break; + else: + printf("check optind"); break; default: (void)OutputHelp(); } -- Gitee From b95ff7e2e75e7df5c086b4d38159eedd8087184f Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 15 Apr 2024 10:06:48 +0000 Subject: [PATCH 4/7] update src/main.c. Signed-off-by: flying --- src/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main.c b/src/main.c index 2284781..8b99dd9 100644 --- a/src/main.c +++ b/src/main.c @@ -128,8 +128,6 @@ int32_t OperateByBitMap(char *const *argv, uint16_t bitMap, char *outputpath) case 0x80: // 0x80, -v if optind < 0 || optind >= argc: (void)OutputVersion(argv[optind], optind); break; - else: - printf("check optind"); break; default: (void)OutputHelp(); } -- Gitee From 3e5caef9209a1106ee3c21993ef6c878871e9e4d Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 15 Apr 2024 10:38:11 +0000 Subject: [PATCH 5/7] update src/main.c. Signed-off-by: flying --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 8b99dd9..0ecbc6f 100644 --- a/src/main.c +++ b/src/main.c @@ -126,7 +126,7 @@ int32_t OperateByBitMap(char *const *argv, uint16_t bitMap, char *outputpath) case 0x10E: // 0x10E, -Rdsi inputfile printf("-Rdsi is not support currently.\n"); break; case 0x80: // 0x80, -v - if optind < 0 || optind >= argc: + if (optind < 0 || optind >= argc): (void)OutputVersion(argv[optind], optind); break; default: (void)OutputHelp(); -- Gitee From f3cddbd929404de454096e72f2f90433d1a3228f Mon Sep 17 00:00:00 2001 From: flying Date: Mon, 15 Apr 2024 12:20:45 +0000 Subject: [PATCH 6/7] update src/main.c. Signed-off-by: flying --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 0ecbc6f..68d3928 100644 --- a/src/main.c +++ b/src/main.c @@ -126,7 +126,7 @@ int32_t OperateByBitMap(char *const *argv, uint16_t bitMap, char *outputpath) case 0x10E: // 0x10E, -Rdsi inputfile printf("-Rdsi is not support currently.\n"); break; case 0x80: // 0x80, -v - if (optind < 0 || optind >= argc): + if (optind < 0 || optind >= 4): (void)OutputVersion(argv[optind], optind); break; default: (void)OutputHelp(); -- Gitee From 4781f86a8dd41bd77acf3cb8e3e7c9fc2f112dc5 Mon Sep 17 00:00:00 2001 From: flying Date: Tue, 16 Apr 2024 01:13:52 +0000 Subject: [PATCH 7/7] update src/main.c. Signed-off-by: flying --- src/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 68d3928..06cc083 100644 --- a/src/main.c +++ b/src/main.c @@ -126,8 +126,9 @@ int32_t OperateByBitMap(char *const *argv, uint16_t bitMap, char *outputpath) case 0x10E: // 0x10E, -Rdsi inputfile printf("-Rdsi is not support currently.\n"); break; case 0x80: // 0x80, -v - if (optind < 0 || optind >= 4): + if (optind < 0 || optind >= 4){ (void)OutputVersion(argv[optind], optind); break; + } default: (void)OutputHelp(); } -- Gitee