widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Protect against race conditions when removing keys"

Browse Source
This commit is contained in:
Rahul Frias
2022-01-24 22:31:58 +00:00
committed by Android (Google) Code Review
parent 2e738c2989 a4756e2a7f
commit af99d774d4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -464,6 +464,7 @@ CdmResponseType CdmEngine::RestoreKey(const CdmSessionId& session_id,
CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) { CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) {
LOGI("session_id = %s", IdToString(session_id)); LOGI("session_id = %s", IdToString(session_id));
std::shared_ptr<CdmSession> session; std::shared_ptr<CdmSession> session;
std::unique_lock<std::recursive_mutex> lock(session_map_lock_);
if (!session_map_.FindSession(session_id, &session)) { if (!session_map_.FindSession(session_id, &session)) {
LOGE("Session not found: session_id = %s", IdToString(session_id)); LOGE("Session not found: session_id = %s", IdToString(session_id));
return SESSION_NOT_FOUND_5; return SESSION_NOT_FOUND_5;
@@ -475,6 +476,7 @@ CdmResponseType CdmEngine::RemoveKeys(const CdmSessionId& session_id) {
CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) { CdmResponseType CdmEngine::RemoveLicense(const CdmSessionId& session_id) {
LOGI("session_id = %s", IdToString(session_id)); LOGI("session_id = %s", IdToString(session_id));
std::shared_ptr<CdmSession> session; std::shared_ptr<CdmSession> session;
std::unique_lock<std::recursive_mutex> lock(session_map_lock_);
if (!session_map_.FindSession(session_id, &session)) { if (!session_map_.FindSession(session_id, &session)) {
LOGE("Session not found: session_id = %s", IdToString(session_id)); LOGE("Session not found: session_id = %s", IdToString(session_id));
return SESSION_NOT_FOUND_19; return SESSION_NOT_FOUND_19;