commit c24deb62e9809fd812e2ceac688ff766bf31b5ae
author Marco Nelissen <marcone@google.com> Tue Apr 11 16:08:24 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 11 16:08:25 2017 +0000
tree c56705bb22f6c8c5192ae83b37e74b01aaa488b0
parent dab5aae9390dccda539c2c805904440bc1e41e9e
parent 81b554b04c93aebf3e74116330024272770d2967

Merge "Don't allow using or allocating a buffer after the first state transition" into oc-dev

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 807c2ea..7132f9b 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -1033,6 +1033,11 @@
     }
 
     Mutex::Autolock autoLock(mLock);
+    if (!mSailed) {
+        ALOGE("b/35467458");
+        android_errorWriteLog(0x534e4554, "35467458");
+        return BAD_VALUE;
+    }
 
     switch (omxBuffer.mBufferType) {
         case OMXBuffer::kBufferTypePreset:
@@ -1470,6 +1475,11 @@
 
     Mutex::Autolock autoLock(mLock);
 
+    if (!mSailed) {
+        ALOGE("b/35467458");
+        android_errorWriteLog(0x534e4554, "35467458");
+        return BAD_VALUE;
+    }
     BufferMeta *buffer_meta = new BufferMeta(portIndex);
 
     OMX_BUFFERHEADERTYPE *header;