From 5e46b7d8ad536d65e358750972b663efe53ee40b Mon Sep 17 00:00:00 2001 From: huaqingsimeng <1004904143@qq.com> Date: Sun, 23 Apr 2023 10:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E4=BB=BD=E6=81=A2?= =?UTF-8?q?=E5=A4=8Dextension=E6=B8=85=E7=A9=BAtar=5F=E6=97=B6=E6=9C=AA?= =?UTF-8?q?=E5=8A=A0=E9=94=81=E5=AF=BC=E8=87=B4=E6=9D=A1=E4=BB=B6=E7=AB=9E?= =?UTF-8?q?=E4=BA=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huaqingsimeng --- frameworks/native/backup_ext/include/ext_extension.h | 2 ++ frameworks/native/backup_ext/src/ext_extension.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frameworks/native/backup_ext/include/ext_extension.h b/frameworks/native/backup_ext/include/ext_extension.h index 9469f3df5..d0cbc4b74 100644 --- a/frameworks/native/backup_ext/include/ext_extension.h +++ b/frameworks/native/backup_ext/include/ext_extension.h @@ -16,6 +16,7 @@ #ifndef OHOS_FILEMGMT_BACKUP_BACKUP_EXT_EXTENSION_H #define OHOS_FILEMGMT_BACKUP_BACKUP_EXT_EXTENSION_H +#include #include #include @@ -80,6 +81,7 @@ private: void AsyncTaskRestore(); private: + std::shared_mutex lock_; std::shared_ptr extension_; std::vector tars_; OHOS::ThreadPool threadPool_; diff --git a/frameworks/native/backup_ext/src/ext_extension.cpp b/frameworks/native/backup_ext/src/ext_extension.cpp index 3bb40c769..6cea0bd31 100644 --- a/frameworks/native/backup_ext/src/ext_extension.cpp +++ b/frameworks/native/backup_ext/src/ext_extension.cpp @@ -108,7 +108,7 @@ ErrCode BackupExtExtension::HandleClear() if (!ForceRemoveDirectory(restoreCache)) { HILOGI("Failed to delete the restore cache %{public}s", restoreCache.c_str()); } - + unique_lock lock(lock_); tars_.clear(); } catch (const BError &e) { return e.GetCode(); @@ -193,10 +193,13 @@ ErrCode BackupExtExtension::PublishFile(const string &fileName) string path = string(BConstants::PATH_BUNDLE_BACKUP_HOME).append(BConstants::SA_BUNDLE_BACKUP_RESTORE); string tarName = path + fileName; - if (find(tars_.begin(), tars_.end(), fileName) != tars_.end() || access(tarName.data(), F_OK) != 0) { - return BError(-EPERM); + { + unique_lock lock(lock_); + if (find(tars_.begin(), tars_.end(), fileName) != tars_.end() || access(tarName.data(), F_OK) != 0) { + return BError(-EPERM); + } + tars_.push_back(fileName); } - tars_.push_back(fileName); // 异步执行解压操作 if (extension_->AllowToBackupRestore()) { -- Gitee