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 | 185a19319e61ccd5e8806b7d00a20192dbcaf1f8 (patch) | |
| tree | 1980e1ce6a6cf8d98ddee830a20f312655b997ba /drm | |
| parent | fb6c6167c81c6ade0956d05924eebdeeec65d973 (diff) | |
| parent | 409e5a07f044239aac2059c9ba3b3f6f48eeaba1 (diff) | |
| download | frameworks_av-185a19319e61ccd5e8806b7d00a20192dbcaf1f8.zip frameworks_av-185a19319e61ccd5e8806b7d00a20192dbcaf1f8.tar.gz frameworks_av-185a19319e61ccd5e8806b7d00a20192dbcaf1f8.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; } |