diff options
| author | Gloria Wang <gwang@google.com> | 2011-06-13 16:29:38 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-06-13 16:29:38 -0700 |
| commit | cbe0d94adf1f25a31689026d2fbbc9e9eb4e84eb (patch) | |
| tree | a0198279c777d54d397b73337aed33f49f79f5b6 /drm | |
| parent | 26cfe80fe168f8cecea6a9eab697c80f1efeccce (diff) | |
| download | frameworks_base-cbe0d94adf1f25a31689026d2fbbc9e9eb4e84eb.zip frameworks_base-cbe0d94adf1f25a31689026d2fbbc9e9eb4e84eb.tar.gz frameworks_base-cbe0d94adf1f25a31689026d2fbbc9e9eb4e84eb.tar.bz2 | |
Duplicated fileDesc is not closed when input file is not forward-lock content.
Fix for bug 4606053.
Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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; |