commit f43ad654dc4c950c7080990a300c1671e05774c5
author Robert Shih <robertshih@google.com> Thu Jul 14 01:43:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 14 01:43:52 2016 +0000
tree eea7ced93ca6036b0650c598a2137c4244aab031
parent aad3552a45127b978b7952a6ca89272db8950eec
parent 83d7bdbcebe35bba88fb41015255f808a045f5e4

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

Change-Id: I1d0e31020d3cf327a552854192dfa5c8e4ca4a09

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;