From 3cb99027176d218e87f8adf5040789485993c805 Mon Sep 17 00:00:00 2001 From: wangdengjia Date: Tue, 19 Apr 2022 11:01:45 +0800 Subject: [PATCH 1/2] IssueNo:#I53EKU Description:Add check before reference Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: wangdengjia Change-Id: I4ca486a3621a0a1e9a3107d7f90f457d2e81b605 --- services/bundlemgr_lite/src/gt_bundle_manager_service.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 9794067..1949749 100755 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -995,6 +995,9 @@ void GtManagerService::APP_QueryAppInfo(const char *appDir, AppInfoList *list) return; } char *fileName = reinterpret_cast(AdapterMalloc(MAX_NAME_LEN + 1)); + if (fileName == nullptr) { + return; + } while ((ent = readdir(dir)) != nullptr) { if (memset_s(fileName, MAX_NAME_LEN + 1, 0, MAX_NAME_LEN + 1) != EOK) { break; -- Gitee From eda4f9c42b99ade49572fd3d3b86891f7a7f33d2 Mon Sep 17 00:00:00 2001 From: wangdengjia Date: Tue, 19 Apr 2022 11:05:40 +0800 Subject: [PATCH 2/2] IssueNo:#I53EJC Description:Add check before reference Sig:appexecfwk Feature or Bugfix:Bugfix Binary Source:No Signed-off-by: wangdengjia Change-Id: Ia4497c6f13020c846bc54e9342de9a728ed43cbf --- services/bundlemgr_lite/src/bundle_mgr_service.cpp | 2 +- services/bundlemgr_lite/src/gt_bundle_manager_service.cpp | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/services/bundlemgr_lite/src/bundle_mgr_service.cpp b/services/bundlemgr_lite/src/bundle_mgr_service.cpp index 59eddf6..086ec2d 100755 --- a/services/bundlemgr_lite/src/bundle_mgr_service.cpp +++ b/services/bundlemgr_lite/src/bundle_mgr_service.cpp @@ -88,7 +88,7 @@ BOOL BundleMgrService::ServiceMessageHandle(Service *service, Request *request) g_bmsbuff->bundleInstallerCallback); } else if (request->msgId == BMS_SCAN_PACKAGE_MSG) { OHOS::GtManagerService::GetInstance().ScanPackages(); - } else if (request->msgId == BMS_REGISTER_CALLBACK_MSG) { + } else if (request->msgId == BMS_REGISTER_CALLBACK_MSG && g_bmsbuff != nullptr) { OHOS::GtManagerService::GetInstance().RegisterInstallerCallback(g_bmsbuff->bundleInstallerCallback); } else { return FALSE; diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 1949749..9794067 100755 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -995,9 +995,6 @@ void GtManagerService::APP_QueryAppInfo(const char *appDir, AppInfoList *list) return; } char *fileName = reinterpret_cast(AdapterMalloc(MAX_NAME_LEN + 1)); - if (fileName == nullptr) { - return; - } while ((ent = readdir(dir)) != nullptr) { if (memset_s(fileName, MAX_NAME_LEN + 1, 0, MAX_NAME_LEN + 1) != EOK) { break; -- Gitee