commit c275189ccbfe8ca29437a24256195c61de2f2a6d
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Nov 16 21:00:10 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 16 21:00:10 2017 +0000
tree 3bb9b7e28c39c1e77b236235b8dabcd692be5526
parent 602417cd10c569783c2cc32bb7c13b1e02d9645e
parent 4199198abdbf64afb4f55691144d12aa0fa68624

Merge "NDK: fix undefined behavior"

media/ndk/NdkImage.cpp

diff --git a/media/ndk/NdkImage.cpp b/media/ndk/NdkImage.cpp
index c4ff537..20b1667 100644
--- a/media/ndk/NdkImage.cpp
+++ b/media/ndk/NdkImage.cpp
@@ -37,8 +37,8 @@
         mTimestamp(timestamp), mWidth(width), mHeight(height), mNumPlanes(numPlanes) {
 }
 
-// Can only be called by free() with mLock hold
 AImage::~AImage() {
+    Mutex::Autolock _l(mLock);
     if (!mIsClosed) {
         LOG_ALWAYS_FATAL(
                 "Error: AImage %p is deleted before returning buffer to AImageReader!", this);
@@ -78,7 +78,6 @@
         ALOGE("Cannot free AImage before close!");
         return;
     }
-    Mutex::Autolock _l(mLock);
     delete this;
 }