commit abcb685e004ce8c525e2cc5b1ec8f0650ed24411
author Sungtak Lee <taklee@google.com> Fri Jan 18 13:15:07 2019 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 03 01:13:51 2019 +0000
tree 1d54c9d8e9e7c3d5af124b4516f86c665f7ecd3b
parent f7c5e8f651b0929802552eacdd4883f1672a2e77

Handle gralloc handle leaks

Delete locked handle from C2AllocatorGralloc.
Delete temporary cloned handle from C2OMXNode.

Bug: 122978854
Change-Id: I6cff2775380e85e4ca83315df06fe59a42e6a4ca
(cherry picked from commit b8fef7e941c01599fd37a2ef7dc70707d51a0906)

codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/codec2/vndk/C2AllocatorGralloc.cpp b/codec2/vndk/C2AllocatorGralloc.cpp
index b0ec5f1..4004e5f 100644
--- a/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/codec2/vndk/C2AllocatorGralloc.cpp
@@ -315,6 +315,11 @@
         native_handle_delete(
                 const_cast<native_handle_t *>(reinterpret_cast<const native_handle_t *>(mHandle)));
     }
+    if (mLockedHandle) {
+        native_handle_delete(
+                const_cast<native_handle_t *>(
+                        reinterpret_cast<const native_handle_t *>(mLockedHandle)));
+    }
 }
 
 c2_status_t C2AllocationGralloc::map(

media/sfplugin/C2OMXNode.cpp

diff --git a/media/sfplugin/C2OMXNode.cpp b/media/sfplugin/C2OMXNode.cpp
index 5b9aebb..9b15398 100644
--- a/media/sfplugin/C2OMXNode.cpp
+++ b/media/sfplugin/C2OMXNode.cpp
@@ -225,14 +225,18 @@
     if (omxBuf.mBufferType == OMXBuffer::kBufferTypeANWBuffer
             && omxBuf.mGraphicBuffer != nullptr) {
         std::shared_ptr<C2GraphicAllocation> alloc;
+        native_handle_t *clonedHandle = native_handle_clone(omxBuf.mGraphicBuffer->handle);
         handle = WrapNativeCodec2GrallocHandle(
-                native_handle_clone(omxBuf.mGraphicBuffer->handle),
+                clonedHandle,
                 omxBuf.mGraphicBuffer->width,
                 omxBuf.mGraphicBuffer->height,
                 omxBuf.mGraphicBuffer->format,
                 omxBuf.mGraphicBuffer->usage,
                 omxBuf.mGraphicBuffer->stride);
         c2_status_t err = mAllocator->priorGraphicAllocation(handle, &alloc);
+        if (clonedHandle) {
+            native_handle_delete(clonedHandle);
+        }
         if (err != OK) {
             return UNKNOWN_ERROR;
         }