openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 12:43:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

!12671 fix cj namespace leak

Browse Source 
Merge pull request !12671 from liuyics15/master
This commit is contained in:
openharmony_ci
2025-02-19 01:43:00 +00:00
committed by Gitee
parent 5dbaeb427f aada88cacd
commit 4e2349859d
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cj_environment/frameworks/cj_environment/src/cj_environment.cpp
+17 -3
View File
@@ -229,9 +229,18 @@ void CJEnvironment::InitSpawnEnv()
void CJEnvironment::PreloadLibs()
{
LOGI("start Preloadlibs");
LoadCJLibrary(SDK, "libohos.ability.so");
LoadCJLibrary(SDK, "libohos.component.so");
LoadCJLibrary(SDK, "libohos.window.so");
auto lib = LoadCJLibrary(SDK, "libohos.ability.so");
if (lib) {
preloadLibs_.emplace_back(lib);
}
lib = LoadCJLibrary(SDK, "libohos.component.so");
if (lib) {
preloadLibs_.emplace_back(lib);
}
lib = LoadCJLibrary(SDK, "libohos.window.so");
if (lib) {
preloadLibs_.emplace_back(lib);
}
}
void CJEnvironment::SetAppPath(const std::string& appPath)
@@ -266,6 +275,10 @@ CJEnvironment::~CJEnvironment()
StopRuntime();
delete lazyApis_;
for (auto lib : preloadLibs_) {
dlclose(lib);
}
}
CJEnvironment* CJEnvironment::GetInstance()
@@ -298,6 +311,7 @@ bool CJEnvironment::LoadRuntimeApis()
return false;
}
#undef RTLIB_NAME
preloadLibs_.emplace_back(dso);
if (!LoadSymbolInitCJRuntime(dso, *lazyApis_) ||
!LoadSymbolInitUIScheduler(dso, *lazyApis_) ||
!LoadSymbolRunUIScheduler(dso, *lazyApis_) ||
cj_environment/interfaces/inner_api/cj_environment.h
+1
View File
@@ -123,6 +123,7 @@ private:
void* uiScheduler_ {nullptr};
SanitizerKind sanitizerKind_ {SanitizerKind::NONE};
NSMode nsMode_;
std::vector<void*> preloadLibs_;
};
}