From cb0881e8e0cda549cc688bdbc368ac9c431ac92e Mon Sep 17 00:00:00 2001
From: kirby <zhangruiming4@huawei.com>
Date: Mon, 2 Sep 2024 17:05:51 +0800
Subject: [PATCH 1/2] fix_ffi_blue_yellow_consistency

Signed-off-by: kirby <zhangruiming4@huawei.com>
---
 interfaces/kits/cj/src/config_policy_ffi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interfaces/kits/cj/src/config_policy_ffi.cpp b/interfaces/kits/cj/src/config_policy_ffi.cpp
index 6997cd8..3af9e30 100644
--- a/interfaces/kits/cj/src/config_policy_ffi.cpp
+++ b/interfaces/kits/cj/src/config_policy_ffi.cpp
@@ -31,7 +31,7 @@ char** MallocCStringArr(const std::vector<const char*>& origin)
         return nullptr;
     }
     auto size = origin.size();
-    if (size > MAX_MALLOC_LEN) {
+    if (size == 0 || size > MAX_MALLOC_LEN) {
         return nullptr;
     }
     auto arr = static_cast<char**>(malloc(sizeof(char*) * size));
-- 
Gitee


From 6f5f718b4532ef78c83076c30c1f2b413617958f Mon Sep 17 00:00:00 2001
From: kirby <zhangruiming4@huawei.com>
Date: Tue, 29 Oct 2024 15:31:14 +0800
Subject: [PATCH 2/2] fix_consistency

Signed-off-by: kirby <zhangruiming4@huawei.com>
---
 interfaces/kits/cj/src/config_policy_ffi.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interfaces/kits/cj/src/config_policy_ffi.cpp b/interfaces/kits/cj/src/config_policy_ffi.cpp
index 3af9e30..6997cd8 100644
--- a/interfaces/kits/cj/src/config_policy_ffi.cpp
+++ b/interfaces/kits/cj/src/config_policy_ffi.cpp
@@ -31,7 +31,7 @@ char** MallocCStringArr(const std::vector<const char*>& origin)
         return nullptr;
     }
     auto size = origin.size();
-    if (size == 0 || size > MAX_MALLOC_LEN) {
+    if (size > MAX_MALLOC_LEN) {
         return nullptr;
     }
     auto arr = static_cast<char**>(malloc(sizeof(char*) * size));
-- 
Gitee