commit 93aa58fd944b5cfb825f592de29e25a4f02cf97a
author Gloria Wang <gwang@google.com> Tue Jun 21 13:19:36 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 13:19:36 2011 -0700
tree 85367fc54a2d612b2643864e10c68843195f9f24
parent e86c5b2e9fe79f2a6f4187b6a4f2769c0b64168b
parent 7bafb97d3facf974fa4cf26bf182bf7d5f039439

Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp

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 @@
         }
     }
 
+    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;
 }