From dceacdfdaca5e87650d367e4910098d601afaf38 Mon Sep 17 00:00:00 2001
From: lixinsheng2 <lixinsheng2@huawei.com>
Date: Tue, 26 Dec 2023 17:39:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E8=A1=8C=E6=95=B0=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lixinsheng2 <lixinsheng2@huawei.com>
---
 .../src/drivers_pkg_manager/driver_info.cpp   | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/services/native/driver_extension_manager/src/drivers_pkg_manager/driver_info.cpp b/services/native/driver_extension_manager/src/drivers_pkg_manager/driver_info.cpp
index afb7912..3e08ae2 100644
--- a/services/native/driver_extension_manager/src/drivers_pkg_manager/driver_info.cpp
+++ b/services/native/driver_extension_manager/src/drivers_pkg_manager/driver_info.cpp
@@ -40,52 +40,55 @@ int32_t DriverInfo::Serialize(string &str)
     EDM_LOGI(MODULE_COMMON, "DriverInfo Serialize Done, %{public}s", str.c_str());
     return EDM_OK;
 }
-static bool IsJsonObjValid(const Json::Value &jsonObj, const string &member, uint32_t type)
+static bool IsJsonObjValid(const Json::Value &jsonObj, const string &member)
 {
     if (!jsonObj.isMember(member)) {
         EDM_LOGE(MODULE_COMMON, "the json obj do not has menber :%{public}s", member.c_str());
         return false;
     }
     auto realType = jsonObj[member].type();
-    if (realType != type) {
+    if (realType != Json::stringValue) {
         EDM_LOGE(MODULE_COMMON, "the json obj member[%{public}s] type error, need:%{public}d, which is:%{public}d",
-            member.c_str(), type, realType);
+            member.c_str(), Json::stringValue, realType);
         return false;
     }
     return true;
 }
 
+static int32_t checkJsonObj(const Json::Value &jsonObj)
+{
+    if (jsonObj.size() == 0) {
+        EDM_LOGE(MODULE_COMMON, "JsonObj size is 0");
+        return EDM_ERR_JSON_PARSE_FAIL;
+    }
+    if (!IsJsonObjValid(jsonObj, "bus") || !IsJsonObjValid(jsonObj, "vendor") || IsJsonObjValid(jsonObj, "version")
+        || !IsJsonObjValid(jsonObj, "ext_info")) {
+        EDM_LOGE(MODULE_COMMON, "json member or member type error");
+        return EDM_ERR_JSON_OBJ_ERR;
+    }
+    return EDM_OK;
+}
+
 int32_t DriverInfo::UnSerialize(const string &str)
 {
     Json::CharReaderBuilder builder;
     const unique_ptr<Json::CharReader> reader(builder.newCharReader());
     JSONCPP_STRING err;
     Json::Value jsonObj;
-    string extInfo;
     auto rawJsonLength = static_cast<int32_t>(str.length());
     EDM_LOGD(MODULE_COMMON, "UnSeiralize, input str is : [%{public}s], length = %{public}d", \
         str.c_str(), rawJsonLength);
-    bool ret = reader->parse(str.c_str(), \
-                             str.c_str() + rawJsonLength, \
-                             &jsonObj,\
-                             &err);
+    bool ret = reader->parse(str.c_str(), str.c_str() + rawJsonLength, &jsonObj, &err);
     if (ret == false) {
         EDM_LOGE(MODULE_COMMON, "UnSeiralize error, parse json string error, ret = %{public}d, str is : %{public}s", \
             ret, str.c_str());
         EDM_LOGE(MODULE_COMMON, "JsonErr:%{public}s", err.c_str());
         return EDM_ERR_JSON_PARSE_FAIL;
     }
-    if (jsonObj.size() == 0) {
-        EDM_LOGE(MODULE_COMMON, "JsonObj size is 0");
-        return EDM_ERR_JSON_PARSE_FAIL;
+    int32_t retCode = checkJsonObj(jsonObj);
+    if (retCode != EDM_OK) {
+        return retCode;
     }
-    if (!IsJsonObjValid(jsonObj, "bus", Json::stringValue)\
-        ||!IsJsonObjValid(jsonObj, "vendor", Json::stringValue)\
-        ||!IsJsonObjValid(jsonObj, "version", Json::stringValue)\
-        ||!IsJsonObjValid(jsonObj, "ext_info", Json::stringValue)) {
-            EDM_LOGE(MODULE_COMMON, "json member or member type error");
-            return EDM_ERR_JSON_OBJ_ERR;
-        }
     auto busType = jsonObj["bus"].asString();
     auto busExt = BusExtensionCore::GetInstance().GetBusExtensionByName(LowerStr(busType));
     if (busExt == nullptr) {
@@ -98,7 +101,7 @@ int32_t DriverInfo::UnSerialize(const string &str)
         return EDM_EER_MALLOC_FAIL;
     }
 
-    extInfo = jsonObj["ext_info"].asString();
+    string extInfo = jsonObj["ext_info"].asString();
     ret = this->driverInfoExt_->UnSerialize(extInfo);
     if (ret != EDM_OK) {
         EDM_LOGE(MODULE_COMMON, "parse ext_info error");
-- 
Gitee