commit 1f2608e3819626bb389ba403ef08e0979e2d9f53
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 26 00:01:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 26 00:01:50 2022 +0000
tree 815ab05ea39d6e89ebbbf44fab1a758e70e1b393
parent 253154a2087c5744808f5f6fb5e32c058106603d
parent a946fb3a41b9bc67264053b824aa58c2d4ffa88e

Merge "Codec2: fix leaked graphic buffer handles" am: a946fb3a41

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1999631

Change-Id: I8c30e250d1ae44dfecf62bdd6f0ed6f8f34cfac2

media/codec2/vndk/C2AllocatorGralloc.cpp

diff --git a/media/codec2/vndk/C2AllocatorGralloc.cpp b/media/codec2/vndk/C2AllocatorGralloc.cpp
index b5200a5..d8d6f06 100644
--- a/media/codec2/vndk/C2AllocatorGralloc.cpp
+++ b/media/codec2/vndk/C2AllocatorGralloc.cpp
@@ -265,6 +265,7 @@
 
         for (const PlaneLayoutComponent &component : plane.components) {
             if (!gralloc4::isStandardPlaneLayoutComponentType(component.type)) {
+                mapper.unlock(handle);
                 return C2_CANNOT_DO;
             }
 
@@ -287,6 +288,7 @@
                     channel = C2PlaneInfo::CHANNEL_CR;
                     break;
                 default:
+                    mapper.unlock(handle);
                     return C2_CORRUPTED;
             }