commit 2729dcf5981d1ee966f98c6b7c03cd4ae9674954
author Sungtak Lee <taklee@google.com> Fri Jan 18 13:15:07 2019 -0800
committer Sungtak Lee <taklee@google.com> Wed Jan 23 18:32:33 2019 -0800
tree bf9c83b8cbb3b15d40d730d3fe8585844a63af73
parent fa94a3ba799c3aadb405ef12deee9531e05dbcee

Handle gralloc handle leaks

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

Bug: 122978854
Change-Id: I6cff2775380e85e4ca83315df06fe59a42e6a4ca

media/codec2/sfplugin/C2OMXNode.cpp

diff --git a/media/codec2/sfplugin/C2OMXNode.cpp b/media/codec2/sfplugin/C2OMXNode.cpp
index 749fd7a..9500aed 100644
--- a/media/codec2/sfplugin/C2OMXNode.cpp
+++ b/media/codec2/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;
         }