diff options
| author | Robert Shih <robertshih@google.com> | 2013-11-12 00:20:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-12 00:20:46 +0000 |
| commit | 0f3984ed3271484e223826e8a2e5f70c4111e08f (patch) | |
| tree | 1166e208f739d8494ca975fc32447c294ab4a02e | |
| parent | ceb7a2e9e3bf8ab566d94f247c5c7c136484d0e7 (diff) | |
| parent | 817d4aa19e6a9c95ec20486e6d74dea5a38e7236 (diff) | |
| download | frameworks_av-0f3984ed3271484e223826e8a2e5f70c4111e08f.zip frameworks_av-0f3984ed3271484e223826e8a2e5f70c4111e08f.tar.gz frameworks_av-0f3984ed3271484e223826e8a2e5f70c4111e08f.tar.bz2 | |
Merge "Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType."
| -rw-r--r-- | drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp | 1 |
1 files changed, 1 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 234aef2..f400732 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp @@ -316,6 +316,7 @@ String8 FwdLockEngine::onGetOriginalMimeType(int uniqueId, const String8& path, if (-1 < fileDesc) { if (FwdLockFile_attach(fileDesc) < 0) { + close(fileDesc); return mimeString; } const char* pMimeType = FwdLockFile_GetContentType(fileDesc); |