commit 6771263604cf8e464b5cd1278823b0898af3a2a9
author Gloria Wang <gwang@google.com> Tue Jun 14 10:05:55 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 14 10:05:55 2011 -0700
tree 27f3bfe550a0b755cd0e21f0af0700a1bd358e70
parent 3f1545d22a71f960c9598a24e7e48ec16dd16267
parent 50872c0b6563b75bb02e0de2fd578b40db8227db

Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053."

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 d430f72..3cbd8f1 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
@@ -455,11 +455,14 @@
         } else {
             LOGD("FwdLockEngine::onOpenDecryptSession Integrity Check failed for the fd");
             FwdLockFile_detach(fileDesc);
-            ::close(fileDesc);
             delete decodeSession;
         }
     }
 
+    if (DRM_NO_ERROR != result && -1 < fileDesc) {
+        ::close(fileDesc);
+    }
+
     LOGD("FwdLockEngine::onOpenDecryptSession Exit. result = %d", result);
 
     return result;