diff --git a/services/backup_sa/src/module_ipc/sa_backup_connection.cpp b/services/backup_sa/src/module_ipc/sa_backup_connection.cpp index 13f2cb77954e280d76f1c7e9cb6e50d99dada539..231389520e76a1e08b7b6916951d2ad92a9d3082 100644 --- a/services/backup_sa/src/module_ipc/sa_backup_connection.cpp +++ b/services/backup_sa/src/module_ipc/sa_backup_connection.cpp @@ -117,7 +117,7 @@ ErrCode SABackupConnection::LoadBackupSAExtInner() } int32_t ret = samgrProxy->LoadSystemAbility(saId_, loadCallback); if (ret != ERR_OK) { - HILOGE("Failed to Load systemAbility, systemAbility:%{private}d. ret code:%{public}d", saId_, ret); + HILOGE("Failed to Load systemAbility, systemAbility:%{public}d. ret code:%{public}d", saId_, ret); return BError(BError::Codes::SA_EXT_ERR_SAMGR); } isLoaded_.store(true); @@ -221,7 +221,7 @@ ErrCode SABackupConnection::CallRestoreSA(UniqueFd fd) void SABackupConnection::SALoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const OHOS::sptr &remoteObject) { - HILOGI("Load backup sa success, systemAbilityId: %{private}d, remoteObject result:%{private}s", systemAbilityId, + HILOGI("Load backup sa success, systemAbilityId: %{public}d, remoteObject result:%{public}s", systemAbilityId, (remoteObject != nullptr) ? "true" : "false"); if (remoteObject == nullptr) { isLoadSuccess_.store(false); @@ -234,7 +234,7 @@ void SABackupConnection::SALoadCallback::OnLoadSystemAbilitySuccess(int32_t syst void SABackupConnection::SALoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - HILOGE("Load backup sa failed, systemAbilityId:%{private}d", systemAbilityId); + HILOGE("Load backup sa failed, systemAbilityId:%{public}d", systemAbilityId); isLoadSuccess_.store(false); proxyConVar_.notify_one(); } diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index 5ba1614be812dbf149bac8a7044aef64f59432ff..b8fd85bd6fdb4b4f263b2bae851c4121a2c9f5e8 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -992,6 +992,10 @@ ErrCode Service::GetFileHandle(const string &bundleName, const string &fileName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { + if (session_ == nullptr) { + HILOGE("GetFileHandle error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG); + } VerifyCaller(IServiceReverse::Scenario::RESTORE); bool updateRes = SvcRestoreDepsManager::GetInstance().UpdateToRestoreBundleMap(bundleName, fileName); diff --git a/services/backup_sa/src/module_ipc/service_incremental.cpp b/services/backup_sa/src/module_ipc/service_incremental.cpp index 0e15923672c18cf668024cafc80156abbb708ace..72b8e60c7da6b706f1d7ea5c7c241e69c6cd464a 100644 --- a/services/backup_sa/src/module_ipc/service_incremental.cpp +++ b/services/backup_sa/src/module_ipc/service_incremental.cpp @@ -81,6 +81,10 @@ ErrCode Service::Release() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); HILOGI("KILL"); + if (session_ == nullptr) { + HILOGE("Release error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG); + } IServiceReverse::Scenario scenario = session_->GetScenario(); VerifyCaller(scenario); AppRadar::Info info("", "", "call release"); @@ -564,6 +568,10 @@ ErrCode Service::GetIncrementalFileHandle(const std::string &bundleName, const s { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { + if (session_ == nullptr) { + HILOGE("GetIncrementalFileHandle error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG); + } VerifyCaller(IServiceReverse::Scenario::RESTORE); auto action = session_->GetServiceSchedAction(bundleName); if (action == BConstants::ServiceSchedAction::RUNNING) { diff --git a/services/backup_sa/src/module_ipc/sub_service.cpp b/services/backup_sa/src/module_ipc/sub_service.cpp index b269ace2ad33fc04ff4e7fa3e319a6487cee19e3..d497d26cba0d0b61921c62a2021de4569f2371fa 100644 --- a/services/backup_sa/src/module_ipc/sub_service.cpp +++ b/services/backup_sa/src/module_ipc/sub_service.cpp @@ -93,6 +93,10 @@ ErrCode Service::PublishFile(const BFileInfo &fileInfo) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { + if (session_ == nullptr) { + HILOGE("PublishFile error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG); + } VerifyCaller(IServiceReverse::Scenario::RESTORE); if (!fileInfo.fileName.empty()) { HILOGE("Forbit to use publishFile with fileName for App"); @@ -128,6 +132,10 @@ ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCo { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { + if (session_ == nullptr) { + HILOGE("AppFileReady error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG); + } string callerName = VerifyCallerAndGetCallerName(); if (fileName.find('/') != string::npos) { throw BError(BError::Codes::SA_INVAL_ARG, "Filename is not valid"); diff --git a/utils/src/b_filesystem/b_dir.cpp b/utils/src/b_filesystem/b_dir.cpp index 1d8f3d41bc6ce965c01ff52f0b89bca825da4c4d..b37901395a1dc8778de4ed5cc6505ba74387081a 100644 --- a/utils/src/b_filesystem/b_dir.cpp +++ b/utils/src/b_filesystem/b_dir.cpp @@ -85,7 +85,7 @@ static uint32_t CheckOverLongPath(const string &path) if (len >= PATH_MAX_LEN) { size_t found = path.find_last_of(BConstants::FILE_SEPARATOR_CHAR); string sub = path.substr(found + 1); - HILOGE("Path over long, length:%{public}d, fileName:%{public}s.", len, sub.c_str()); + HILOGE("Path over long, length:%{public}d, fileName:%{private}s.", len, sub.c_str()); } return len; }