From 466a2cb8f535347d58b676c5251f21cec4cbbc04 Mon Sep 17 00:00:00 2001 From: wangdengjia Date: Tue, 19 Apr 2022 11:05:40 +0800 Subject: [PATCH] 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;