From 1d37197cbcb5bbcd36f2006ee10caa17fb849867 Mon Sep 17 00:00:00 2001 From: xsz233 Date: Tue, 22 Nov 2022 15:19:16 +0800 Subject: [PATCH] fix alerts Signed-off-by: xsz233 --- .../bundlemgr_lite/src/gt_bundle_manager_service.cpp | 7 +++++++ services/bundlemgr_lite/src/gt_extractor_util.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 61f763f..e7d4a05 100644 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -350,6 +350,9 @@ void GtManagerService::InstallAllSystemBundle(InstallerCallback installerCallbac PreAppList *currentNode = nullptr; PreAppList *nextNode = nullptr; LOS_DL_LIST_FOR_EACH_ENTRY_SAFE(currentNode, nextNode, &list->appDoubleList, PreAppList, appDoubleList) { + if (currentNode == nullptr) { + return; + } if ((strcmp(((PreAppList *)currentNode)->filePath, ".") == 0) || (strcmp(((PreAppList *)currentNode)->filePath, "..") == 0)) { continue; @@ -492,6 +495,10 @@ void GtManagerService::ScanThirdApp(const char *appDir, const List(AdapterMalloc(MAX_BUNDLE_NAME_LEN + 1)); + if (bundleName == nullptr) { + closedir(dir); + return; + } int32_t entLen = 0; while ((ent = readdir(dir)) != nullptr) { ++entLen; diff --git a/services/bundlemgr_lite/src/gt_extractor_util.cpp b/services/bundlemgr_lite/src/gt_extractor_util.cpp index 0485c06..13b167a 100644 --- a/services/bundlemgr_lite/src/gt_extractor_util.cpp +++ b/services/bundlemgr_lite/src/gt_extractor_util.cpp @@ -34,7 +34,7 @@ const uint8_t SHIFT_NUM = 8; uint32_t GtExtractorUtil::ReadInt(int32_t fp) { unsigned char buf[INT_LENGTH] = {0}; - if (read(fp, buf, INT_LENGTH) != INT_LENGTH) { + if (read(fp, buf, INT_LENGTH) != INT_LENGTH) { return UINT_MAX; } @@ -108,7 +108,7 @@ uint8_t GtExtractorUtil::ExtractFileHeaderInfo(int32_t fp, char **bundleName) return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } - if ((*bundleName = (char *)ReadString(fp, bundleNameLen)) == nullptr) { + if ((*bundleName = reinterpret_cast(ReadString(fp, bundleNameLen))) == nullptr) { return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } return ERR_OK; @@ -136,7 +136,7 @@ uint8_t GtExtractorUtil::ExtractFileAttr(int32_t fp, char **fileName, char **rel return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } - if ((*fileName = (char *)ReadString(fp, nameLen)) == nullptr) { + if ((*fileName = reinterpret_cast(ReadString(fp, nameLen))) == nullptr) { HILOG_ERROR(HILOG_MODULE_AAFWK, "[BMS] Read fileName fail"); return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } @@ -146,7 +146,7 @@ uint8_t GtExtractorUtil::ExtractFileAttr(int32_t fp, char **fileName, char **rel HILOG_ERROR(HILOG_MODULE_AAFWK, "[BMS] Read path Int fail"); return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } else { - if ((*relativeFilePath = (char *)ReadString(fp, pathLen)) == nullptr) { + if ((*relativeFilePath = reinterpret_cast(ReadString(fp, pathLen))) == nullptr) { HILOG_ERROR(HILOG_MODULE_AAFWK, "[BMS] Read relativeFilePath fail"); return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } @@ -168,7 +168,7 @@ uint8_t GtExtractorUtil::ExtractFileAttr(int32_t fp, char **fileName, uint32_t & return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } - if ((*fileName = (char *)ReadString(fp, nameLen)) == nullptr) { + if ((*fileName = reinterpret_cast(ReadString(fp, nameLen))) == nullptr) { HILOG_ERROR(HILOG_MODULE_AAFWK, "[BMS] Read fileName fail"); return ERR_APPEXECFWK_INSTALL_FAILED_FILE_DATA_INVALID; } -- Gitee