openharmony/multimedia_drm_framework
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_drm_framework.git synced 2026-08-27 03:41:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

oem证书管理逻辑资源泄露修改

Browse Source 
Signed-off-by: baoxy92 <baoxianyue@hisilicon.com>
This commit is contained in:
baoxy92
2023-12-23 04:58:29 +00:00
committed by Gitee
parent 358a9319f2
commit fb746fda8e
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/drm_service/server/src/drm_host_manager.cpp
+20 -10
View File
@@ -73,7 +73,6 @@ void DrmHostManager::StopServiceThread()
if (StopThread) {
StopThread();
}
dlclose(libHandle);
ReleaseHandleAndKeySystemMap(libHandle);
}
loadedLibs.clear();
@@ -99,11 +98,9 @@ void DrmHostManager::ProcessMessage()
}
if (libHandle) {
std::lock_guard<std::mutex> lockLib(libMutex);
dlclose(libHandle);
ReleaseHandleAndKeySystemMap(libHandle);
loadedLibs.erase(std::remove(loadedLibs.begin(), loadedLibs.end(), libHandle),
loadedLibs.end());
libHandle = nullptr;
}
}
}
@@ -122,6 +119,10 @@ void DrmHostManager::ReleaseHandleAndKeySystemMap(void *handle)
it->second = nullptr;
}
handleAndKeySystemMap.erase(handle);
if (handle != nullptr) {
dlclose(handle);
handle = nullptr;
}
}
void DrmHostManager::ServiceThreadMain()
@@ -140,6 +141,8 @@ void DrmHostManager::ServiceThreadMain()
DRM_DEBUG_LOG("DrmHostManager::ServiceThreadMain fullPath:%{public}s.", fullPath.c_str());
libsToLoad.push_back(fullPath);
}
closedir(dir);
dir = nullptr;
}
for (const auto &libpath : libsToLoad) {
std::lock_guard<std::mutex> lockLib(libMutex);
@@ -155,16 +158,24 @@ void DrmHostManager::ServiceThreadMain()
if (QueryMediaKeySystemName && SetMediaKeySystem && ThreadExitNotify && StartThread && StopThread) {
std::string uuid;
int32_t ret = QueryMediaKeySystemName(uuid);
DRM_CHECK_AND_RETURN_LOG(ret == DRM_OK, "QueryMediaKeySystemName faild.");
if (ret != DRM_OK) {
ReleaseHandleAndKeySystemMap(handle);
DRM_ERR_LOG("DrmHostManager::QueryMediaKeySystemName error!");
continue;
}
ret = CreateMediaKeySystem(uuid, hdiMediaKeySystem);
if (ret != DRM_OK) {
ReleaseHandleAndKeySystemMap(handle);
DRM_ERR_LOG("DrmHostManager::CreateMediaKeySystem error!");
continue;
}
std::lock_guard<std::mutex> lockHandle(handleAndKeySystemMapMutex);
handleAndKeySystemMap.insert(std::make_pair(handle, hdiMediaKeySystem));
DRM_CHECK_AND_RETURN_LOG(ret == DRM_OK && hdiMediaKeySystem != nullptr, "CreateMediaKeySystem faild.");
ret = SetMediaKeySystem(hdiMediaKeySystem);
if (ret != DRM_OK) {
ReleaseHandleAndKeySystemMap(handle);
DRM_ERR_LOG("DrmHostManager::SetMediaKeySystem error!");
return;
continue;
}
if (IsProvisionRequired()) {
std::lock_guard<std::mutex> lockLibMap(libMapMutex);
@@ -173,19 +184,18 @@ void DrmHostManager::ServiceThreadMain()
if (ret != DRM_OK) {
ReleaseHandleAndKeySystemMap(handle);
DRM_ERR_LOG("DrmHostManager::ThreadExitNotify error!");
return;
continue;
}
ret = StartThread();
if (ret != DRM_OK) {
ReleaseHandleAndKeySystemMap(handle);
DRM_ERR_LOG("DrmHostManager::StartThread error!");
return;
continue;
}
} else {
dlclose(handle);
loadedLibs.pop_back();
ReleaseHandleAndKeySystemMap(handle);
DRM_DEBUG_LOG("OEM certificate exist!");
DRM_DEBUG_LOG("Faild to obtain the symbol table in the so!");
}
}
}