From 29ab18b416a5c7e745ef4153a49c737235ad5081 Mon Sep 17 00:00:00 2001
From: zhaoyuan17 <zhaoyuan17@huawei.com>
Date: Wed, 29 Sep 2021 01:05:53 +0800
Subject: [PATCH] fix codex

Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
---
 services/appmgr/src/lmks/lmks_utils.cpp         |  2 +-
 .../src/ams_st_data_ability_data_a.cpp          | 17 +++++++++++++++--
 .../src/ams_st_data_ability_data_c1.cpp         |  9 +++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/services/appmgr/src/lmks/lmks_utils.cpp b/services/appmgr/src/lmks/lmks_utils.cpp
index ea37d7eb8e..f275a2af5b 100644
--- a/services/appmgr/src/lmks/lmks_utils.cpp
+++ b/services/appmgr/src/lmks/lmks_utils.cpp
@@ -107,7 +107,7 @@ std::string LmksUtils::GetProcName(pid_t pid)
         return name;
     }
 
-    if (strlen(line) + 1 <= PROC_LINE_MAX && strlen(line) != 0 && line[strlen(line)] == '\0') {
+    if (strlen(line) + 1 <= PROC_LINE_MAX && strlen(line) != 0) {
         name = line;
     } else {
         HiLog::Error(LABEL, "cmdline no data");
diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
index 4ed0914be2..45f840465d 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
@@ -99,12 +99,17 @@ int AmsStDataAbilityDataA::Insert(const Uri &uri, const NativeRdb::ValuesBucket
 {
     APP_LOGI("AmsStDataAbilityDataA <<<<Insert>>>>");
     PublishEvent(abilityEventName, ABILITY_DATA_A_CODE, "Insert");
-    FILE *file = fdopen(fd, "r");
+    if (fd <= 0) {
+        APP_LOGI("-------------------AmsStDataAbilityDataA <<<<Insert>>>> file fd <= 0");
+        return DEFAULT_INSERT_RESULT;
+    }
+    int dupFd = dup(fd);
+    FILE *file = fdopen(dupFd, "r");
     if (file == nullptr) {
         APP_LOGI("-------------------AmsStDataAbilityDataA <<<<Insert>>>> file == nullptr");
     } else {
         APP_LOGI("-------------------AmsStDataAbilityDataA <<<<Insert>>>> file != nullptr");
-        delete file;
+        fclose(file);
         file = nullptr;
     }
     return DEFAULT_INSERT_RESULT;
@@ -135,7 +140,15 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> AmsStDataAbilityDataA::Query(
     subscriber_->TestPost();
 
     std::shared_ptr<NativeRdb::AbsSharedResultSet> resultValue = std::make_shared<NativeRdb::AbsSharedResultSet>(OPERATOR_QUERY);
+    if (resultValue == nullptr) {
+        APP_LOGE("AmsStDataAbilityDataA <<<<Query>>>> make_shared return nullptr");
+        return nullptr;
+    }
     AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock();
+    if (pSharedBlock == nullptr) {
+        APP_LOGE("AmsStDataAbilityDataA <<<<Query>>>> GetBlock return nullptr");
+        return nullptr;
+    }
     pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1);
     return resultValue;
 }
diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp
index 863fc30055..d22ef2d2b0 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp
@@ -97,12 +97,17 @@ int AmsStDataAbilityDataC1::Insert(const Uri &uri, const NativeRdb::ValuesBucket
 {
     APP_LOGI("AmsStDataAbilityDataC1 <<<<Insert>>>>");
     PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "Insert");
-    FILE *file = fdopen(fd, "r");
+    if (fd <= 0) {
+        APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<<Insert>>>> file fd <= 0");
+        return DEFAULT_INSERT_RESULT;
+    }
+    int dupFd = dup(fd);
+    FILE *file = fdopen(dupFd, "r");
     if (file == nullptr) {
         APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<<Insert>>>> file == nullptr");
     } else {
         APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<<Insert>>>> file != nullptr");
-        delete file;
+        fclose(file);
         file = nullptr;
     }
     return DEFAULT_INSERT_RESULT;
-- 
Gitee