From 8a3d3ab5f865519d944398f76e3cc406f811798e Mon Sep 17 00:00:00 2001
From: maoyongxing <mWX1099545@china.huawei.com>
Date: Fri, 23 Sep 2022 11:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/small/src/service/cert_framework_service.c      | 2 +-
 cert_mgr_service/services/core/cert/cert_service_active.c     | 2 +-
 cert_mgr_service/services/core/cert/cert_service_challenge.c  | 4 ++--
 cert_mgr_service/services/core/cert/cert_service_reset.c      | 2 +-
 cert_mgr_service/services/oem_adapter/src/cert_mgr_oem_file.c | 1 +
 cert_mgr_service/test/startup/cert_framework_client_start.c   | 3 +--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cert_mgr_service/framework/small/src/service/cert_framework_service.c b/cert_mgr_service/framework/small/src/service/cert_framework_service.c
index a7ba09d..4829727 100644
--- a/cert_mgr_service/framework/small/src/service/cert_framework_service.c
+++ b/cert_mgr_service/framework/small/src/service/cert_framework_service.c
@@ -21,7 +21,7 @@
 
 int main(void)
 {
-    sleep(2);
+    sleep(2); // 延后2秒启动
     HILOGI("certmgr-start:SAMGR_Bootstrap");
     SAMGR_Bootstrap();
     while (1) {
diff --git a/cert_mgr_service/services/core/cert/cert_service_active.c b/cert_mgr_service/services/core/cert/cert_service_active.c
index 2e4f401..bac8ddc 100644
--- a/cert_mgr_service/services/core/cert/cert_service_active.c
+++ b/cert_mgr_service/services/core/cert/cert_service_active.c
@@ -100,7 +100,7 @@ int32_t ParseActiveResult(const char* jsonStr)
         return CERT_ERR;
     }
     int32_t errorCode = (int32_t)GetObjectItemValueNumber(jsonStr, "errcode");
-    if (isnan(errorCode)) {
+    if (isnan(errorCode) || errorCode < 0) {
         CERT_LOG_ERROR("[ParseActiveResult] errorCode is nan.");
         return CERT_ERR;
     }
diff --git a/cert_mgr_service/services/core/cert/cert_service_challenge.c b/cert_mgr_service/services/core/cert/cert_service_challenge.c
index 260403f..038533d 100644
--- a/cert_mgr_service/services/core/cert/cert_service_challenge.c
+++ b/cert_mgr_service/services/core/cert/cert_service_challenge.c
@@ -86,7 +86,7 @@ static int32_t ParseChallengeResult(const char* jsonStr, ChallengeResult *challe
         return CERT_ERR;
     }
     int32_t errorCode = (int32_t) GetObjectItemValueNumber(jsonStr, "errcode");
-    if (isnan(errorCode)) {
+    if (isnan(errorCode) || errorCode < 0) {
         CERT_LOG_WARN("[ParseChallengeResult] errorCode is nan.");
         CERT_LOG_ERROR("[ParseChallengeResult] Parse msg failed.");
         return CERT_ERR;
@@ -97,7 +97,7 @@ static int32_t ParseChallengeResult(const char* jsonStr, ChallengeResult *challe
     }
 
     challenge->currentTime = GetObjectItemValueNumber(jsonStr, "currentTime");
-    if (isnan(challenge->currentTime)) {
+    if (isnan(challenge->currentTime)|| challenge->currentTime < 0) {
         CERT_LOG_WARN("[ParseChallengeResult] currentTime is nan.");
         CERT_LOG_ERROR("[ParseChallengeResult] GetObjectItem currentTime failed.");
         return CERT_ERR;
diff --git a/cert_mgr_service/services/core/cert/cert_service_reset.c b/cert_mgr_service/services/core/cert/cert_service_reset.c
index 722bd09..fede769 100644
--- a/cert_mgr_service/services/core/cert/cert_service_reset.c
+++ b/cert_mgr_service/services/core/cert/cert_service_reset.c
@@ -87,7 +87,7 @@ int32_t ParseResetResult(const char* jsonStr)
         return CERT_ERR;
     }
     int32_t errorCode = (int32_t) GetObjectItemValueNumber(jsonStr, "errcode");
-    if (isnan(errorCode)) {
+    if (isnan(errorCode)|| errorCode < 0) {
         CERT_LOG_ERROR("[ParseResetResult] errorCode is nan.");
         return CERT_ERR;
     }
diff --git a/cert_mgr_service/services/oem_adapter/src/cert_mgr_oem_file.c b/cert_mgr_service/services/oem_adapter/src/cert_mgr_oem_file.c
index 42fc7ba..77ee392 100644
--- a/cert_mgr_service/services/oem_adapter/src/cert_mgr_oem_file.c
+++ b/cert_mgr_service/services/oem_adapter/src/cert_mgr_oem_file.c
@@ -92,6 +92,7 @@ static int32_t OEMGetFileSize(const char* path, const char* fileName, uint32_t*
     }
 
     char* formatPath = realpath(filePath, NULL);
+    free(filePath);
     if (formatPath == NULL) {
         return CERT_MGR_OEM_ERR;
     }
diff --git a/cert_mgr_service/test/startup/cert_framework_client_start.c b/cert_mgr_service/test/startup/cert_framework_client_start.c
index 3c62031..9a12fc1 100644
--- a/cert_mgr_service/test/startup/cert_framework_client_start.c
+++ b/cert_mgr_service/test/startup/cert_framework_client_start.c
@@ -24,7 +24,7 @@ int main(void)
 {
     int32_t ret = StartCertTask();
     if (ret == 0) {
-        sleep(5);
+        sleep(5); // 延后5s再查询
 
         CertResultInfo certResultInfo = { 0 };
         certResultInfo.ticket = NULL;
@@ -43,7 +43,6 @@ int main(void)
         }
     }
     printf("[CLIENT MAIN] end.\n");
-    // (void)StartCertTask();
     while (1) {
         pause();
     }
-- 
Gitee