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

Merge "Fix Memory Leak In OEMCrypto Level 3 Haystack"

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2015-04-06 01:52:19 +00:00
committed by Android (Google) Code Review
parent 8a37cd4538 42f7458cfc
commit 88d9472cfb
6 changed files with 19 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -233,10 +233,6 @@ class Adapter {
Adapter() : level1_valid_(false), level1_library_(NULL) {}
~Adapter() {
for (map_iterator i = session_map_.begin(); i != session_map_.end(); i++) {
if (i->second.fcn) i->second.fcn->CloseSession(i->second.session);
}
session_map_.clear();
}
OEMCryptoResult Initialize() {
@@ -405,6 +401,10 @@ class Adapter {
}
OEMCryptoResult Terminate() {
for (map_iterator i = session_map_.begin(); i != session_map_.end(); ++i) {
if (i->second.fcn) i->second.fcn->CloseSession(i->second.session);
}
session_map_.clear();
OEMCryptoResult result = Level3_Terminate();
if (level1_valid_) {
result = level1_.Terminate();
@@ -602,6 +602,7 @@ OEMCryptoResult OEMCrypto_GetMaxNumberOfSessions(SecurityLevel level,
extern "C" OEMCryptoResult OEMCrypto_Initialize(void) {
if (kAdapter) {
kAdapter->Terminate();
delete kAdapter;
}
kAdapter = new Adapter();