diff options
| author | Gloria Wang <gwang@google.com> | 2011-06-21 13:19:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-21 13:19:36 -0700 |
| commit | 93aa58fd944b5cfb825f592de29e25a4f02cf97a (patch) | |
| tree | 85367fc54a2d612b2643864e10c68843195f9f24 /drm | |
| parent | e86c5b2e9fe79f2a6f4187b6a4f2769c0b64168b (diff) | |
| parent | 7bafb97d3facf974fa4cf26bf182bf7d5f039439 (diff) | |
| download | frameworks_base-93aa58fd944b5cfb825f592de29e25a4f02cf97a.zip frameworks_base-93aa58fd944b5cfb825f592de29e25a4f02cf97a.tar.gz frameworks_base-93aa58fd944b5cfb825f592de29e25a4f02cf97a.tar.bz2 | |
Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp index 07b3b47..31c3c14 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp @@ -512,6 +512,19 @@ status_t FwdLockEngine::onCloseDecryptSession(int uniqueId, } } + if (NULL != decryptHandle) { + if (NULL != decryptHandle->decryptInfo) { + delete decryptHandle->decryptInfo; + decryptHandle->decryptInfo = NULL; + } + + decryptHandle->copyControlVector.clear(); + decryptHandle->extendedData.clear(); + + delete decryptHandle; + decryptHandle = NULL; + } + LOGV("FwdLockEngine::onCloseDecryptSession Exit"); return result; } |