commit 1d4554785472f478acfbf60479cd662475926c74
author Marco Nelissen <marcone@google.com> Mon May 23 14:49:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 14:49:20 2016 +0000
tree 2757b0e72ecaf7723050b1a9a483d513be7d1ee3
parent f518e501786c73675605365b829a174e5d5c17df
parent 6d1da7d53995c1a171eedc99bd9b17d8dfe3d158

Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88ad am: f6e3609de2
am: 6d1da7d539

* commit '6d1da7d53995c1a171eedc99bd9b17d8dfe3d158':
  Check malloc result to avoid NPD

Change-Id: I92303d3c07ff920a4c7e2d1a94bd341102035ba1

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 70f684b..ed1317a 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -545,6 +545,10 @@
     }
     if (psshsize) {
         char *buf = (char*)malloc(psshsize);
+        if (!buf) {
+            ALOGE("b/28471206");
+            return NO_MEMORY;
+        }
         char *ptr = buf;
         for (size_t i = 0; i < mPssh.size(); i++) {
             memcpy(ptr, mPssh[i].uuid, 20); // uuid + length
@@ -1643,6 +1647,11 @@
 
             sp<ABuffer> buffer = new ABuffer(chunk_data_size);
 
+            if (buffer->data() == NULL) {
+                ALOGE("b/28471206");
+                return NO_MEMORY;
+            }
+
             if (mDataSource->readAt(
                         data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {
                 return ERROR_IO;
@@ -1657,6 +1666,11 @@
         {
             sp<ABuffer> buffer = new ABuffer(chunk_data_size);
 
+            if (buffer->data() == NULL) {
+                ALOGE("b/28471206");
+                return NO_MEMORY;
+            }
+
             if (mDataSource->readAt(
                         data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {
                 return ERROR_IO;
@@ -1959,6 +1973,10 @@
                     return ERROR_MALFORMED;
                 }
                 sp<ABuffer> buffer = new ABuffer(chunk_data_size + 1);
+                if (buffer->data() == NULL) {
+                    ALOGE("b/28471206");
+                    return NO_MEMORY;
+                }
                 if (mDataSource->readAt(
                     data_offset, buffer->data(), chunk_data_size) != (ssize_t)chunk_data_size) {
                     return ERROR_IO;