From 79d0e4e4175936603020252bd432b897f204141b Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Fri, 24 May 2024 08:56:08 +0000 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9src/syscap=5Ftool.c?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E6=B6=88=E9=99=A4freeAfterEncodeRpc?= =?UTF-8?q?idscInfo.type=E5=8F=98=E9=87=8F=E9=9D=99=E6=80=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=91=8A=E8=AD=A6=20=E6=B6=88=E9=99=A4freeAfterEncode?= =?UTF-8?q?RpcidscInfo.type=E5=8F=98=E9=87=8F=E9=9D=99=E6=80=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=91=8A=E8=AD=A6=EF=BC=8CredundantAssignment?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- src/syscap_tool.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/syscap_tool.c b/src/syscap_tool.c index e7b1314..692b5bd 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); -- Gitee From 0dba699804535ca5366bcd172e025ec74c4c8f81 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Sat, 25 May 2024 01:10:10 +0000 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9src/syscap=5Ftool.c?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8CfreeAfterEncodeRpcidscInfo.osSysCapI?= =?UTF-8?q?ndex=E5=86=85=E5=AD=98=E6=8C=87=E9=92=88=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AE=8C=E5=90=8E=E7=BD=AE=E7=A9=BA=20freeAf?= =?UTF-8?q?terEncodeRpcidscInfo.osSysCapIndex=E5=86=85=E5=AD=98=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=8F=98=E9=87=8F=E4=BD=BF=E7=94=A8=E5=AE=8C=E5=90=8E?= =?UTF-8?q?=E7=BD=AE=E7=A9=BA=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=B3=84=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- src/syscap_tool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/syscap_tool.c b/src/syscap_tool.c index 692b5bd..26198ba 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -493,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); } -- Gitee From a578bf0ac4a7ae6c5f77bad6ba273790196b9fbe Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Sat, 25 May 2024 01:36:34 +0000 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9interfaces/inner=5Fapi/sy?= =?UTF-8?q?scap=5Finterface.c=E6=96=87=E4=BB=B6251=E8=A1=8C=EF=BC=8Coutput?= =?UTF-8?q?=E6=8C=87=E9=92=88=E5=8F=98=E9=87=8F=E5=9C=A8=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=AE=8C=E5=90=8E=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- interfaces/inner_api/syscap_interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/inner_api/syscap_interface.c b/interfaces/inner_api/syscap_interface.c index 34cb6f0..c70d560 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; -- Gitee From 69d64e624dbafcdc4a7f9d78f505612494a8cff2 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Sat, 25 May 2024 03:02:52 +0000 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9src/create=5Fpcid.c?= =?UTF-8?q?=E6=96=87=E4=BB=B6361=E8=A1=8C=EF=BC=8C=E6=B6=88=E9=99=A4contex?= =?UTF-8?q?tBufLen=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E5=B0=8F=E4=BA=8E0?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- src/create_pcid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/create_pcid.c b/src/create_pcid.c index 6f9a373..2d772c2 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -362,7 +362,12 @@ int32_t GetPriSyscap(PCIDMain *pcidMain, cJSON *sysCapObject, size_t contextBufL return -1; } - if (contextBufLen < 0 || contextBufLen > UINT32_MAX) { + if (contextBufLen < 0) { + PRINT_ERR("the data privateSyscapLen is less than zero."); + return GetPriSyscapResult(capVectorPtr, -1); + } + + if (contextBufLen > UINT32_MAX) { PRINT_ERR("the data privateSyscapLen is out of scope."); return GetPriSyscapResult(capVectorPtr, -1); } -- Gitee From b4e6038872bb8ac94dc950a93fa893f1a423e85c Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Sat, 25 May 2024 06:04:39 +0000 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9src/create=5Fpcid.c?= =?UTF-8?q?=EF=BC=8CfreePcidInfo.priSyscapFull=E4=BD=BF=E7=94=A8=E5=AE=8C?= =?UTF-8?q?=E5=90=8E=E7=BD=AE=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- src/create_pcid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/create_pcid.c b/src/create_pcid.c index 2d772c2..aab5b16 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -914,5 +914,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 -- Gitee From 1887fd57684ff20d4aa95cf7a26bfce397bc6b66 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Sat, 25 May 2024 06:23:37 +0000 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9src/create=5Fpcid.c?= =?UTF-8?q?=E6=96=87=E4=BB=B6704=E8=A1=8C=EF=BC=8CpriSyscapStr=E6=8C=87?= =?UTF-8?q?=E9=92=88=E5=8F=98=E9=87=8F=E4=BD=BF=E7=94=A8=E5=AE=8C=E5=90=8E?= =?UTF-8?q?=E7=BD=AE=E7=A9=BA=EF=BC=8C=E6=B6=88=E9=99=A4=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- src/create_pcid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/create_pcid.c b/src/create_pcid.c index aab5b16..36ce7a6 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -710,7 +710,7 @@ static int32_t GetSyscapStr(char *input, char const *priSyscapStr, uint32_t* osS free(ctx); return -1; } - priSyscapStr = ctx; + priSyscapStr = NULL; free(ctx); return 0; } -- Gitee From 613a595cf374b395fdd14e06fcd1a131f81353c4 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Sat, 25 May 2024 08:19:25 +0000 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9napi/napi=5Fquery=5Fsysca?= =?UTF-8?q?p.cpp=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96QuerySystemCa?= =?UTF-8?q?pability=E5=87=BD=E6=95=B0=EF=BC=8C=E6=B6=88=E9=99=A4=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E8=A1=8C=E6=95=B0=E8=BF=87=E5=A4=9A=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=20=E6=8B=86=E5=88=86QuerySystemCapability=E5=87=BD=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E9=99=A4=E5=87=BD=E6=95=B0=E8=A1=8C=E6=95=B0?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- napi/napi_query_syscap.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/napi/napi_query_syscap.cpp b/napi/napi_query_syscap.cpp index 6f75b2b..54b9bda 100644 --- a/napi/napi_query_syscap.cpp +++ b/napi/napi_query_syscap.cpp @@ -149,14 +149,12 @@ FREE_PRIOUTPUT: return allSyscapBuffer; } -napi_value QuerySystemCapability(napi_env env, napi_callback_info info) +napi_value PreHandleSystemCapability(napi_env env, napi_callback_info info, SystemCapabilityAsyncContext* asyncContext) { GET_PARAMS(env, info, 1); NAPI_ASSERT(env, argc <= 1, "too many parameters"); napi_value result = nullptr; - SystemCapabilityAsyncContext* asyncContext = new SystemCapabilityAsyncContext(); - asyncContext->env = env; napi_valuetype valueType = napi_undefined; @@ -172,6 +170,13 @@ napi_value QuerySystemCapability(napi_env env, napi_callback_info info) } else { napi_get_undefined(env, &result); } + return result; +} + +napi_value QuerySystemCapability(napi_env env, napi_callback_info info) +{ + SystemCapabilityAsyncContext* asyncContext = new SystemCapabilityAsyncContext(); + napi_value result = PreHandleSystemCapability(env, info, asyncContext); napi_value resource = nullptr; napi_create_string_utf8(env, "napi_value QuerySystemCapability", NAPI_AUTO_LENGTH, &resource); -- Gitee From 9e014642073f54cc488827705e65f980c441d9ed Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 28 May 2024 03:51:52 +0000 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9napi/napi=5Fquery=5Fsysca?= =?UTF-8?q?p.cpp=EF=BC=8C=E5=9B=9E=E9=80=80=E9=80=9A=E7=94=A8=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- napi/napi_query_syscap.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/napi/napi_query_syscap.cpp b/napi/napi_query_syscap.cpp index 54b9bda..ca6a958 100644 --- a/napi/napi_query_syscap.cpp +++ b/napi/napi_query_syscap.cpp @@ -149,12 +149,14 @@ FREE_PRIOUTPUT: return allSyscapBuffer; } -napi_value PreHandleSystemCapability(napi_env env, napi_callback_info info, SystemCapabilityAsyncContext* asyncContext) +napi_value QuerySystemCapability(napi_env env, napi_callback_info info) { GET_PARAMS(env, info, 1); NAPI_ASSERT(env, argc <= 1, "too many parameters"); napi_value result = nullptr; + SystemCapabilityAsyncContext* asyncContext = new SystemCapabilityAsyncContext(); + asyncContext->env = env; napi_valuetype valueType = napi_undefined; @@ -170,13 +172,7 @@ napi_value PreHandleSystemCapability(napi_env env, napi_callback_info info, Syst } else { napi_get_undefined(env, &result); } - return result; -} - -napi_value QuerySystemCapability(napi_env env, napi_callback_info info) -{ - SystemCapabilityAsyncContext* asyncContext = new SystemCapabilityAsyncContext(); - napi_value result = PreHandleSystemCapability(env, info, asyncContext); + napi_value resource = nullptr; napi_create_string_utf8(env, "napi_value QuerySystemCapability", NAPI_AUTO_LENGTH, &resource); -- Gitee From b3bb55c1b695ba23812935a6876214dbd55ddf56 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 28 May 2024 03:58:04 +0000 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9src/create=5Fpcid.c?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=9D=99=E6=80=81=E6=89=AB=E6=8F=8F=E5=91=8A=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- src/create_pcid.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/create_pcid.c b/src/create_pcid.c index 36ce7a6..8a2f14c 100644 --- a/src/create_pcid.c +++ b/src/create_pcid.c @@ -362,12 +362,7 @@ int32_t GetPriSyscap(PCIDMain *pcidMain, cJSON *sysCapObject, size_t contextBufL return -1; } - if (contextBufLen < 0) { - PRINT_ERR("the data privateSyscapLen is less than zero."); - return GetPriSyscapResult(capVectorPtr, -1); - } - - if (contextBufLen > UINT32_MAX) { + if (contextBufLen < 0 || contextBufLen > UINT32_MAX) { PRINT_ERR("the data privateSyscapLen is out of scope."); return GetPriSyscapResult(capVectorPtr, -1); } @@ -710,7 +705,7 @@ static int32_t GetSyscapStr(char *input, char const *priSyscapStr, uint32_t* osS free(ctx); return -1; } - priSyscapStr = NULL; + priSyscapStr = ctx; free(ctx); return 0; } -- Gitee