diff --git a/services/appmgr/src/lmks/lmks_utils.cpp b/services/appmgr/src/lmks/lmks_utils.cpp index ea37d7eb8eac645a1f89153fc943e31d8a3c8452..f275a2af5bb279335ba4529ba41ab6653ff72dc6 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 4ed0914be2de23ddccbb91fab5f5d3f09dc13135..45f840465dbb97fb29ef86af4dd6a3731a353ff2 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 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_A_CODE, "Insert"); - FILE *file = fdopen(fd, "r"); + if (fd <= 0) { + APP_LOGI("-------------------AmsStDataAbilityDataA <<<>>> file fd <= 0"); + return DEFAULT_INSERT_RESULT; + } + int dupFd = dup(fd); + FILE *file = fdopen(dupFd, "r"); if (file == nullptr) { APP_LOGI("-------------------AmsStDataAbilityDataA <<<>>> file == nullptr"); } else { APP_LOGI("-------------------AmsStDataAbilityDataA <<<>>> file != nullptr"); - delete file; + fclose(file); file = nullptr; } return DEFAULT_INSERT_RESULT; @@ -135,7 +140,15 @@ std::shared_ptr AmsStDataAbilityDataA::Query( subscriber_->TestPost(); std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + if (resultValue == nullptr) { + APP_LOGE("AmsStDataAbilityDataA <<<>>> make_shared return nullptr"); + return nullptr; + } AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + if (pSharedBlock == nullptr) { + APP_LOGE("AmsStDataAbilityDataA <<<>>> 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 863fc30055da7e2bfd95de12f80a3d997c5e2c35..d22ef2d2b00535d3796dc1f6e50a85c8bf0800a6 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 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "Insert"); - FILE *file = fdopen(fd, "r"); + if (fd <= 0) { + APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<>>> file fd <= 0"); + return DEFAULT_INSERT_RESULT; + } + int dupFd = dup(fd); + FILE *file = fdopen(dupFd, "r"); if (file == nullptr) { APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<>>> file == nullptr"); } else { APP_LOGI("-------------------AmsStDataAbilityDataC1 <<<>>> file != nullptr"); - delete file; + fclose(file); file = nullptr; } return DEFAULT_INSERT_RESULT;