commit a17d7c030795125c72b42f166fadb6bd3a0ee572
author Robert Shih <robertshih@google.com> Thu Jul 14 01:38:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 14 01:38:00 2016 +0000
tree aa091ad9426bc2236873f0f76acb7897867c3c8d
parent 3cb33198d6f18097602bc913f10190e904d02081
parent 5d36fedeb82d15f630594d01fdfc5e92b9890ade

Merge \\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\" into klp-dev am: f545c72b97 am: d89781f3be am: c9c40b829f am: 29f09eb295
am: 5d36fedeb8

Change-Id: I38291dfa8aa8956b53f074df1084668f53b7f7fe

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 6cb0775..c673387 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1658,7 +1658,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;