commit 83d7bdbcebe35bba88fb41015255f808a045f5e4
author Robert Shih <robertshih@google.com> Thu Jul 14 01:41:16 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 14 01:41:16 2016 +0000
tree 85f429770198238ac3b50decd1e1678aa5800862
parent baba64dd05f2e0bf761b9c2b6851708a70e25783
parent a17d7c030795125c72b42f166fadb6bd3a0ee572

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

Change-Id: If552708dbdb28fe1b744adbd92790faafbc10783

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index f41bbc2..2a012f1 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1662,7 +1662,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;