commit f151b811f0b63e074e5449c3259b9993c1a2f49f
author Wonsik Kim <wonsik@google.com> Wed Apr 10 16:24:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 10 16:24:42 2019 +0000
tree 5269b3934f4ad1009d910d60d66179d538ad967a
parent 05839181a7ffe49e8039bd9e3b794d50281022f9
parent 00e1af968cd4bb83fc0d03dd696f0c0e64ea2a84

Merge "MediaCodec: don't crash on concurrent release/allocate" into qt-dev

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index b6b7784..a7d37e5 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -1934,6 +1934,13 @@
 
                 case kWhatComponentAllocated:
                 {
+                    if (mState == RELEASING || mState == UNINITIALIZED) {
+                        // In case a kWhatError or kWhatRelease message came in and replied,
+                        // we log a warning and ignore.
+                        ALOGW("allocate interrupted by error or release, current state %d",
+                              mState);
+                        break;
+                    }
                     CHECK_EQ(mState, INITIALIZING);
                     setState(INITIALIZED);
                     mFlags |= kFlagIsComponentAllocated;