From 50872c0b6563b75bb02e0de2fd578b40db8227db Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Mon, 13 Jun 2011 16:29:38 -0700 Subject: Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053. Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770 --- .../plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drm') 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 @@ status_t FwdLockEngine::onOpenDecryptSession(int uniqueId, } 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; -- cgit v1.1