commit 6fb1ff39cd71221c75b8e845c21c7106f386cd9d
author Wonsik Kim <wonsik@google.com> Wed Jul 27 14:37:21 2016 +0900
committer Wonsik Kim <wonsik@google.com> Thu Aug 18 10:48:53 2016 +0900
tree a541d2d7e72942294d43f0f509a90cca5df92f17
parent 15223ec262f8f1135be6ee727a480dd4a04457e7

omx: prevent crash at MuxOMX::freeNode for already freed nodes

Bug: 29188904
Change-Id: I5c11ad371d6a060c4b201492aac08a8163d1b658

media/libstagefright/OMXClient.cpp

diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp
index e994069..e40dbcf 100644
--- a/media/libstagefright/OMXClient.cpp
+++ b/media/libstagefright/OMXClient.cpp
@@ -303,6 +303,12 @@
 status_t MuxOMX::freeNode(node_id node) {
     Mutex::Autolock autoLock(mLock);
 
+    // exit if we have already freed the node
+    if (mNodeLocation.indexOfKey(node) < 0) {
+        ALOGD("MuxOMX::freeNode: node %d seems to be released already --- ignoring.", node);
+        return OK;
+    }
+
     status_t err = getOMX_l(node)->freeNode(node);
 
     if (err != OK) {