From eb99d72624ee5311fad525713df1a05c2df4d8b0 Mon Sep 17 00:00:00 2001
From: sunzibin <sunzibin1@h-partners.com>
Date: Fri, 5 Sep 2025 14:05:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: sunzibin <sunzibin1@h-partners.com>
---
 hapsigntool_cpp/api/include/service_api.h     |  2 +-
 hapsigntool_cpp/api/src/cert_tools.cpp        |  2 +-
 .../api/src/sign_tool_service_impl.cpp        |  2 +-
 .../hap/entity/src/sign_content_info.cpp      | 22 +++++++++++++++++++
 hapsigntool_cpp/utils/src/string_utils.cpp    |  2 +-
 .../processcmd007_fuzzer.cpp                  |  2 +-
 .../processcmd008_fuzzer.cpp                  |  2 +-
 .../processcmd009_fuzzer.cpp                  |  2 +-
 .../processcmd010_fuzzer.cpp                  |  2 +-
 .../processcmd011_fuzzer.cpp                  |  2 +-
 .../processcmd012_fuzzer.cpp                  |  2 +-
 .../processcmd013_fuzzer.cpp                  |  2 +-
 .../processcmd014_fuzzer.cpp                  |  2 +-
 .../processcmd015_fuzzer.cpp                  |  2 +-
 .../processcmd016_fuzzer.cpp                  |  2 +-
 .../processcmd017_fuzzer.cpp                  |  2 +-
 .../processcmd018_fuzzer.cpp                  |  8 +++----
 .../processcmd019_fuzzer.cpp                  |  6 ++---
 .../processcmd020_fuzzer.cpp                  |  2 +-
 .../processcmd021_fuzzer.cpp                  |  2 +-
 .../processcmd022_fuzzer.cpp                  |  2 +-
 21 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/hapsigntool_cpp/api/include/service_api.h b/hapsigntool_cpp/api/include/service_api.h
index 968df287..11f5a889 100644
--- a/hapsigntool_cpp/api/include/service_api.h
+++ b/hapsigntool_cpp/api/include/service_api.h
@@ -24,7 +24,7 @@ namespace SignatureTools {
 class ServiceApi {
 public:
     ServiceApi() = default;
-    ~ServiceApi() = default;
+    virtual ~ServiceApi() = default;
 
     virtual bool GenerateKeyStore(Options* params) = 0;
     virtual bool GenerateCsr(Options* params) = 0;
diff --git a/hapsigntool_cpp/api/src/cert_tools.cpp b/hapsigntool_cpp/api/src/cert_tools.cpp
index e634a2e1..7f245c2c 100644
--- a/hapsigntool_cpp/api/src/cert_tools.cpp
+++ b/hapsigntool_cpp/api/src/cert_tools.cpp
@@ -361,7 +361,7 @@ bool CertTools::SetKeyUsage(X509* cert, Options* options)
         }
     } else {
         bool keyUsageCritical = options->GetBool(Options::KEY_USAGE_CRITICAL);
-        int crit = keyUsageCritical > 0 ? 1 : 0;
+        int crit = keyUsageCritical ? 1 : 0;
         std::vector<std::string> vecs = StringUtils::SplitString(keyUsage.c_str(), ',');
         key = std::accumulate(vecs.begin(), vecs.end(), key,
             [&](long key, const std::string& vec) { return key | externDic[vec]; });
diff --git a/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp b/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp
index c2338ffa..537aa153 100644
--- a/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp
+++ b/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp
@@ -160,7 +160,7 @@ int SignToolServiceImpl::HandleIssuerKeyAliasEmpty(Options* options)
             goto err;
         } else if (keyStoreRights == nullptr && issuerKeyStoreRights == nullptr) {
             return RET_OK;
-        } else {
+        } else if (keyStoreRights != nullptr && issuerKeyStoreRights != nullptr) {
             if (std::strcmp(keyStoreRights, issuerKeyStoreRights) != 0) {
                 goto err;
             }
diff --git a/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp b/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp
index 1ef57cf0..3a2839a8 100644
--- a/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp
+++ b/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp
@@ -77,11 +77,33 @@ std::vector<int8_t> SignContentInfo::GetByteContent()
 
     for (const auto& tmp : m_hashData) {
         ret[index] = tmp.m_type;
+
         index++;
+        if (index < 0) {
+            PrintErrorNumberMsg("SIGN_ERROR", SIGN_ERROR, "InsertShortToByteArray failed.");
+            return std::vector<int8_t>();
+        }
+
         ret[index] = tmp.m_tag;
+
         index++;
+        if (index < 0) {
+            PrintErrorNumberMsg("SIGN_ERROR", SIGN_ERROR, "InsertShortToByteArray failed.");
+            return std::vector<int8_t>();
+        }
+
         index = ByteArrayUtils::InsertShortToByteArray(ret, ret.size(), index, tmp.m_algId);
+        if (index < 0) {
+            PrintErrorNumberMsg("SIGN_ERROR", SIGN_ERROR, "InsertShortToByteArray failed.");
+            return std::vector<int8_t>();
+        }
+
         index = ByteArrayUtils::InsertIntToByteArray(ret, index, tmp.m_length);
+        if (index < 0) {
+            PrintErrorNumberMsg("SIGN_ERROR", SIGN_ERROR, "InsertShortToByteArray failed.");
+            return std::vector<int8_t>();
+        }
+
         index = ByteArrayUtils::InsertByteToByteArray(ret, index, tmp.m_hash, tmp.m_hash.size());
         if (index < 0) {
             PrintErrorNumberMsg("SIGN_ERROR", SIGN_ERROR, "InsertShortToByteArray failed.");
diff --git a/hapsigntool_cpp/utils/src/string_utils.cpp b/hapsigntool_cpp/utils/src/string_utils.cpp
index 662065d7..78d9e928 100644
--- a/hapsigntool_cpp/utils/src/string_utils.cpp
+++ b/hapsigntool_cpp/utils/src/string_utils.cpp
@@ -62,7 +62,7 @@ std::string StringUtils::FormatLoading(std::string& dealStr)
     char comma = ',';
     char slash = '/';
     std::string del = dealStr.substr(dealStr.find_first_of("/") + 1, dealStr.size());
-    int position = 0;
+    size_t position = 0;
     while ((position = del.find(slash, position)) != std::string::npos) {
         del.insert(position + 1, " ");
         position++;
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp
index c2bcf426..bcea9fd5 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp
index 8235ac6e..ef0c01eb 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp
index 126faffd..4124e68e 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp
index 6b5465c4..05205c63 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp
index 58876d6e..cdcf1478 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp
index 5cac4319..511a8156 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp
index 6ba7e6e8..924c321e 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp
index a32aedd7..ca702b7a 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp
index 4471bc0a..36f6a1ad 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp
index 0317f86d..bc060a19 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp
index 4f94c4da..61d1054c 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp
index e85d2820..32ce6bf7 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp
@@ -24,7 +24,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
     char arg0[] = "";
@@ -64,7 +64,7 @@ bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 
 bool RemoteSignTest(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
@@ -107,7 +107,7 @@ bool RemoteSignTest(const uint8_t* data, size_t size)
 
 bool SignElf(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
     char arg0[] = "";
@@ -147,7 +147,7 @@ bool SignElf(const uint8_t* data, size_t size)
 
 bool SignBin(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
     char arg0[] = "";
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp
index 197f1664..58b844f8 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp
@@ -28,7 +28,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
@@ -50,7 +50,7 @@ bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 
 bool VerifyElf(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
@@ -74,7 +74,7 @@ bool VerifyElf(const uint8_t* data, size_t size)
 
 bool VerifyBin(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp
index 0d952bef..91d6171e 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp
index ba225d45..455dec65 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp
index a1b9118f..50245dbd 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp
@@ -96,7 +96,7 @@ bool GenerateAppCertTest3()
 }
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size <= 0) {
+    if (!data || size == 0) {
         return true;
     }
 
-- 
Gitee


From cf22f484b4c0ad32a5bcd8a585efe70786062453 Mon Sep 17 00:00:00 2001
From: sunzibin <sunzibin1@h-partners.com>
Date: Fri, 5 Sep 2025 15:28:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: sunzibin <sunzibin1@h-partners.com>
---
 hapsigntool_cpp/api/src/sign_tool_service_impl.cpp |  2 +-
 .../hap/entity/src/sign_content_info.cpp           | 14 ++++++--------
 hapsigntool_cpp/utils/src/string_utils.cpp         |  2 +-
 .../processcmd007_fuzzer/processcmd007_fuzzer.cpp  |  2 +-
 .../processcmd008_fuzzer/processcmd008_fuzzer.cpp  |  2 +-
 .../processcmd009_fuzzer/processcmd009_fuzzer.cpp  |  2 +-
 .../processcmd010_fuzzer/processcmd010_fuzzer.cpp  |  2 +-
 .../processcmd011_fuzzer/processcmd011_fuzzer.cpp  |  2 +-
 .../processcmd012_fuzzer/processcmd012_fuzzer.cpp  |  2 +-
 .../processcmd013_fuzzer/processcmd013_fuzzer.cpp  |  2 +-
 .../processcmd014_fuzzer/processcmd014_fuzzer.cpp  |  2 +-
 .../processcmd015_fuzzer/processcmd015_fuzzer.cpp  |  2 +-
 .../processcmd016_fuzzer/processcmd016_fuzzer.cpp  |  2 +-
 .../processcmd017_fuzzer/processcmd017_fuzzer.cpp  |  2 +-
 .../processcmd018_fuzzer/processcmd018_fuzzer.cpp  |  8 ++++----
 .../processcmd019_fuzzer/processcmd019_fuzzer.cpp  |  6 +++---
 .../processcmd020_fuzzer/processcmd020_fuzzer.cpp  |  2 +-
 .../processcmd021_fuzzer/processcmd021_fuzzer.cpp  |  2 +-
 .../processcmd022_fuzzer/processcmd022_fuzzer.cpp  |  2 +-
 19 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp b/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp
index 537aa153..c2338ffa 100644
--- a/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp
+++ b/hapsigntool_cpp/api/src/sign_tool_service_impl.cpp
@@ -160,7 +160,7 @@ int SignToolServiceImpl::HandleIssuerKeyAliasEmpty(Options* options)
             goto err;
         } else if (keyStoreRights == nullptr && issuerKeyStoreRights == nullptr) {
             return RET_OK;
-        } else if (keyStoreRights != nullptr && issuerKeyStoreRights != nullptr) {
+        } else {
             if (std::strcmp(keyStoreRights, issuerKeyStoreRights) != 0) {
                 goto err;
             }
diff --git a/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp b/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp
index 3a2839a8..de1c6b9a 100644
--- a/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp
+++ b/hapsigntool_cpp/hap/entity/src/sign_content_info.cpp
@@ -76,21 +76,19 @@ std::vector<int8_t> SignContentInfo::GetByteContent()
     }
 
     for (const auto& tmp : m_hashData) {
-        ret[index] = tmp.m_type;
-
-        index++;
-        if (index < 0) {
+        if (index >= ret.size()) {
             PrintErrorNumberMsg("SIGN_ERROR", SIGN_ERROR, "InsertShortToByteArray failed.");
             return std::vector<int8_t>();
         }
-
-        ret[index] = tmp.m_tag;
-
+        ret[index] = tmp.m_type;
         index++;
-        if (index < 0) {
+
+        if (index >= ret.size()) {
             PrintErrorNumberMsg("SIGN_ERROR", SIGN_ERROR, "InsertShortToByteArray failed.");
             return std::vector<int8_t>();
         }
+        ret[index] = tmp.m_tag;
+        index++;
 
         index = ByteArrayUtils::InsertShortToByteArray(ret, ret.size(), index, tmp.m_algId);
         if (index < 0) {
diff --git a/hapsigntool_cpp/utils/src/string_utils.cpp b/hapsigntool_cpp/utils/src/string_utils.cpp
index 78d9e928..b5ccd7c8 100644
--- a/hapsigntool_cpp/utils/src/string_utils.cpp
+++ b/hapsigntool_cpp/utils/src/string_utils.cpp
@@ -62,7 +62,7 @@ std::string StringUtils::FormatLoading(std::string& dealStr)
     char comma = ',';
     char slash = '/';
     std::string del = dealStr.substr(dealStr.find_first_of("/") + 1, dealStr.size());
-    size_t position = 0;
+    std::string::size_type position = 0;
     while ((position = del.find(slash, position)) != std::string::npos) {
         del.insert(position + 1, " ");
         position++;
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp
index bcea9fd5..c2bcf426 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd007_fuzzer/processcmd007_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp
index ef0c01eb..8235ac6e 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd008_fuzzer/processcmd008_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp
index 4124e68e..126faffd 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd009_fuzzer/processcmd009_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp
index 05205c63..6b5465c4 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd010_fuzzer/processcmd010_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp
index cdcf1478..58876d6e 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd011_fuzzer/processcmd011_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp
index 511a8156..5cac4319 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd012_fuzzer/processcmd012_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp
index 924c321e..6ba7e6e8 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd013_fuzzer/processcmd013_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp
index ca702b7a..a32aedd7 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd014_fuzzer/processcmd014_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp
index 36f6a1ad..4471bc0a 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd015_fuzzer/processcmd015_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp
index bc060a19..0317f86d 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd016_fuzzer/processcmd016_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp
index 61d1054c..4f94c4da 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd017_fuzzer/processcmd017_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp
index 32ce6bf7..e85d2820 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd018_fuzzer/processcmd018_fuzzer.cpp
@@ -24,7 +24,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
     char arg0[] = "";
@@ -64,7 +64,7 @@ bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 
 bool RemoteSignTest(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
@@ -107,7 +107,7 @@ bool RemoteSignTest(const uint8_t* data, size_t size)
 
 bool SignElf(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
     char arg0[] = "";
@@ -147,7 +147,7 @@ bool SignElf(const uint8_t* data, size_t size)
 
 bool SignBin(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
     char arg0[] = "";
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp
index 58b844f8..197f1664 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd019_fuzzer/processcmd019_fuzzer.cpp
@@ -28,7 +28,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
@@ -50,7 +50,7 @@ bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 
 bool VerifyElf(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
@@ -74,7 +74,7 @@ bool VerifyElf(const uint8_t* data, size_t size)
 
 bool VerifyBin(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp
index 91d6171e..0d952bef 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd020_fuzzer/processcmd020_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp
index 455dec65..ba225d45 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd021_fuzzer/processcmd021_fuzzer.cpp
@@ -22,7 +22,7 @@ namespace OHOS {
 namespace SignatureTools {
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
diff --git a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp
index 50245dbd..a1b9118f 100644
--- a/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp
+++ b/hapsigntool_cpp_test/fuzztest/process_cmd/processcmd022_fuzzer/processcmd022_fuzzer.cpp
@@ -96,7 +96,7 @@ bool GenerateAppCertTest3()
 }
 bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
 {
-    if (!data || size == 0) {
+    if (!data || size <= 0) {
         return true;
     }
 
-- 
Gitee