commit ed4f365e8b158934937ad0a2e14ede566923bc33
author Robert Shih <robertshih@google.com> Tue Jul 12 18:00:53 2016 -0700
committer gitbuildkicker <android-build@google.com> Tue Aug 16 15:51:49 2016 -0700
tree 63521cb7b7a54a01b5af1632495fce153d87b36f
parent e9ef8505a1a33667ef97b752f77190c24b468015

OMXCodec: check IMemory::pointer() before using allocation

Bug: 29421811
Change-Id: I0a73ba12bae4122f1d89fc92e5ea4f6a96cd1ed1

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 4618e21..7e15e18 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1622,7 +1622,9 @@
 
     for (OMX_U32 i = 0; i < def.nBufferCountActual; ++i) {
         sp<IMemory> mem = mDealer[portIndex]->allocate(def.nBufferSize);
-        CHECK(mem.get() != NULL);
+        if (mem == NULL || mem->pointer() == NULL) {
+            return NO_MEMORY;
+        }
 
         BufferInfo info;
         info.mData = NULL;