openharmony/appexecfwk_standard
1
0
Fork 0
mirror of https://gitee.com/openharmony/appexecfwk_standard synced 2024-11-23 13:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

IssueNo: #I4YGOS : fix bug

Browse Source 
Description:fix bug
Sig:SIG_ApplicaitonFramework
Feature or Bugfix:BugFix
Binary Source:No
Signed-off-by: wangtiantian <wangtiantian19@huawei.com>
This commit is contained in:
wangtiantian 2022-03-18 14:37:55 +08:00
parent 99e237e049
commit 81076fd051
8 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kits/appkit/napi/bundlemgr/bundle_mgr.cpp
View File

@ -5346,7 +5346,7 @@ napi_value GetAbilityLabel(napi_env env, napi_callback_info info)
napi_value ret = GetAbilityLabelWrap(env, info, asyncCallbackInfo);
if (ret == nullptr) {
APP_LOGE("%{public}s ret == nullptr", __func__);
APP_LOGD("%{public}s ret == nullptr", __func__);
if (asyncCallbackInfo != nullptr) {
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;

43
services/bundlemgr/src/bundle_clone_mgr.cpp
View File

@ -58,7 +58,7 @@ BundleCloneMgr::~BundleCloneMgr()
bool BundleCloneMgr::BundleClone(const std::string &bundleName)
{
APP_LOGE("BundleClone start");
APP_LOGD("BundleClone start");
auto result = CheckBundleNameInAllowList(bundleName);
if (result != true) {
APP_LOGE("The APP is not on the AllowList");
@ -85,13 +85,13 @@ bool BundleCloneMgr::BundleClone(const std::string &bundleName)
APP_LOGE("BundleClone fail");
return false;
}
APP_LOGE("clone app success");
APP_LOGD("clone app success");
return true;
}
bool BundleCloneMgr::SetCloneAppName(const std::string &bundleName)
{
APP_LOGE("SetCloneAppName start");
APP_LOGD("SetCloneAppName start");
std::fstream f("/data/clonefile/CloneAppName.json");
bool isExist = f.good();
if (isExist) {
@ -101,25 +101,24 @@ bool BundleCloneMgr::SetCloneAppName(const std::string &bundleName)
if (len == 0) {
jParse[bundleName] = bundleName;
f << std::setw(Constants::DUMP_INDENT) << jParse << std::endl;
APP_LOGE("clone bundleName Of file success (first)");
return true;
APP_LOGD("clone bundleName Of file success (first)");
} else {
f.seekg(0, std::ios::beg);
nlohmann::json jsonFile;
f >> jsonFile;
if (jsonFile.find(bundleName) != jsonFile.end()) {
APP_LOGE("clone bundleName = %{public}s is exist", bundleName.c_str());
f.close();
return false;
} else {
jsonFile[bundleName] = bundleName;
f.seekp(0, std::ios::beg);
f << std::setw(Constants::DUMP_INDENT) << jsonFile << std::endl;
APP_LOGE("clone bundleName = %{public}s Of file success", bundleName.c_str());
return true;
APP_LOGD("clone bundleName = %{public}s Of file success", bundleName.c_str());
}
}
} else {
APP_LOGI("clone file not exist");
APP_LOGE("clone file not exist");
return false;
}
f.close();
@ -164,13 +163,13 @@ bool BundleCloneMgr::DeleteCloneAppName(const std::string &bundleName)
}
}
o.close();
APP_LOGE("clone file AppName delete success");
APP_LOGD("clone file AppName delete success");
return true;
}
bool BundleCloneMgr::CreateCloneBundleInfo(const std::string &bundleName)
{
APP_LOGE("CreateCloneBundleInfo start");
APP_LOGD("CreateCloneBundleInfo start");
dataMgr_ = DelayedSingleton<BundleMgrService>::GetInstance()->GetDataMgr();
if (dataMgr_ == nullptr) {
APP_LOGE("datamgr is nullptr");
@ -181,16 +180,16 @@ bool BundleCloneMgr::CreateCloneBundleInfo(const std::string &bundleName)
APP_LOGE("Clone AppName BundleInfo fail");
return false;
}
APP_LOGE("finish CreateCloneBundleInfo");
APP_LOGD("finish CreateCloneBundleInfo");
cloneInfo_.SetIsCloned(true);
bool LogisCloned = cloneInfo_.GetisCloned();
APP_LOGE("cloneInfo_.GetisCloned() is %{public}d", LogisCloned);
APP_LOGD("cloneInfo_.GetisCloned() is %{public}d", LogisCloned);
return result;
}
ErrCode BundleCloneMgr::ProcessCloneInstall(const std::string &bundleName)
{
APP_LOGE("ProcessCloneInstall start");
APP_LOGD("ProcessCloneInstall start");
ErrCode result = 0;
dataMgr_ = DelayedSingleton<BundleMgrService>::GetInstance()->GetDataMgr();
if (!ModifyInstallDirByHapType(cloneInfo_)) {
@ -215,13 +214,13 @@ ErrCode BundleCloneMgr::ProcessCloneInstall(const std::string &bundleName)
std::string Newbundlename = cloneInfo_.GetDBKeyBundleName();
dataMgr_->EnableBundle(Newbundlename);
dataMgr_->EnableBundle(bundleName_);
APP_LOGE("ProcessCloneInstall finish");
APP_LOGD("ProcessCloneInstall finish");
return ERR_OK;
}
ErrCode BundleCloneMgr::CreateBundleAndDataDir(InnerBundleInfo &info) const
{
APP_LOGE("CreateBundleAndDataDir start");
APP_LOGD("CreateBundleAndDataDir start");
auto cloneCodePath = cloneInfo_.GetAppCodePath();
APP_LOGI("clone create bundle dir %{private}s", cloneCodePath.c_str());
InnerBundleUserInfo newInnerBundleUserInfo;
@ -233,10 +232,10 @@ ErrCode BundleCloneMgr::CreateBundleAndDataDir(InnerBundleInfo &info) const
}
info.SetApplicationInfoUid();
int logUid = info.GetApplicationInfoUid();
APP_LOGE("info.uid is %{public}d", logUid);
APP_LOGD("info.uid is %{public}d", logUid);
bool LogisCloned = info.GetisCloned();
APP_LOGE("info.GetisCloned is %{public}d", LogisCloned);
APP_LOGD("info.GetisCloned is %{public}d", LogisCloned);
info.SetNewBundleName(bundleName_);
std::string Newbundlename = info.GetDBKeyBundleName();
@ -250,7 +249,7 @@ ErrCode BundleCloneMgr::CreateBundleAndDataDir(InnerBundleInfo &info) const
return result;
}
UpdateBundlePaths(info, cloneDataPath);
APP_LOGE("CreateBundleAndDataDir finish");
APP_LOGD("CreateBundleAndDataDir finish");
return ERR_OK;
}
@ -280,7 +279,7 @@ bool BundleCloneMgr::ModifyInstallDirByHapType(InnerBundleInfo &info)
bool BundleCloneMgr::UpdateBundlePaths(InnerBundleInfo &info, const std::string baseDataPath) const
{
APP_LOGE("Clone UpdateBundlePaths");
APP_LOGD("Clone UpdateBundlePaths");
info.SetBaseDataDir(baseDataPath);
info.SetAppDataDir(baseDataPath);
info.SetAppDataBaseDir(baseDataPath + Constants::PATH_SEPARATOR + Constants::DATA_BASE_DIR);
@ -307,9 +306,9 @@ bool BundleCloneMgr::RemoveClonedBundle(const std::string &oldName, const std::s
}
auto uid = newcloneInfo_.GetUid();
std::string Newbundlename = cloneInfo_.GetDBKeyBundleName();
APP_LOGE("Newbundlename is %{public}s", Newbundlename.c_str());
APP_LOGD("Newbundlename is %{public}s", Newbundlename.c_str());
ScopeGuard enableCloneGuard([&] { dataMgr_->EnableBundle(Newbundlename); });
APP_LOGE("bundleName_ is %{public}s", bundleName_.c_str());
APP_LOGD("bundleName_ is %{public}s", bundleName_.c_str());
ScopeGuard enableGuard([&] { dataMgr_->EnableBundle(bundleName_); });
if (!UninstallApplicationProcesses(newcloneInfo_.GetApplicationName(), uid)) {
@ -341,10 +340,12 @@ bool BundleCloneMgr::CheckBundleNameInAllowList(const std::string &bundleName)
if (ifs.is_open()) {
jsonObject=nlohmann::json::parse(ifs);
if (jsonObject.empty()) {
ifs.close();
return false;
}
for (auto item : jsonObject) {
if (item ["bundlename"] == bundleName) {
ifs.close();
return true;
}
}

4
services/bundlemgr/src/bundle_data_mgr.cpp
View File

@ -154,7 +154,7 @@ bool BundleDataMgr::AddInnerBundleInfo(const std::string &bundleName, InnerBundl
bool BundleDataMgr::SaveNewInfoToDB(const std::string &bundleName, InnerBundleInfo &info)
{
APP_LOGE("SaveNewInfoToDB start");
APP_LOGD("SaveNewInfoToDB start");
std::string Newbundlename = info.GetDBKeyBundleName();
APP_LOGI("to save clone newinfo to DB info:%{public}s", Newbundlename.c_str());
if (bundleName.empty()) {
@ -184,7 +184,7 @@ bool BundleDataMgr::SaveNewInfoToDB(const std::string &bundleName, InnerBundleIn
}
return true;
}
APP_LOGE("SaveNewInfoToDB finish");
APP_LOGD("SaveNewInfoToDB finish");
return false;
}

1
services/bundlemgr/src/bundle_data_storage.cpp
View File

@ -71,6 +71,7 @@ bool BundleDataStorage::LoadAllData(std::map<std::string, std::map<std::string,
jParse = nlohmann::json::parse(i, nullptr, false);
if (jParse.is_discarded()) {
APP_LOGE("bad bundle database file");
i.close();
return false;
}
for (auto &app : jParse.items()) {

3
services/bundlemgr/src/rpcid_decode/syscap_tool.c
View File

@ -48,6 +48,9 @@ static void FreeContextBuffer(char *contextBuffer)
static int32_t GetFileContext(char *inputFile, char **contextBufPtr, uint32_t *bufferLen)
{
if (inputFile == NULL) {
return ERROR;
}
int32_t ret;
FILE *fp = NULL;
struct stat statBuf;

2
test/fuzztest/ParseSysCap_fuzzer/ParseSysCap_fuzzer.cpp
View File

@ -30,7 +30,7 @@ namespace OHOS {
}
bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
{
if (size <= 4) {
if ((size <= 4) || (data == nullptr)) {
return false;
}

2
test/fuzztest/Parse_fuzzer/Parse_fuzzer.cpp
View File

@ -29,7 +29,7 @@ namespace OHOS {
}
bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
{
if (size <= 4) {
if ((size <= 4) || (data == nullptr)) {
return false;
}

6
tools/zip/src/zip_internal.cpp
View File

@ -56,6 +56,9 @@ struct tm GetTmDataFromTickts(int64_t sec)
// a file stream.
void *FdOpenFileFunc(void *opaque, const char *filename, int mode)
{
if ((opaque == nullptr) || (filename == nullptr)) {
return nullptr;
}
FILE *file = nullptr;
const char *mode_fopen = nullptr;
uint32_t modeInner = static_cast<uint32_t>(mode);
@ -86,6 +89,9 @@ int FdCloseFileFunc(void *opaque, void *stream)
// referred to by |fd|.
void FillFdOpenFileFunc(zlib_filefunc_def *pzlibFilefuncDef, PlatformFile fd)
{
if (pzlibFilefuncDef == nullptr) {
return;
}
fill_fopen_filefunc(pzlibFilefuncDef);
pzlibFilefuncDef->zopen_file = FdOpenFileFunc;
pzlibFilefuncDef->zclose_file = FdCloseFileFunc;