5 files changed, 11 insertions, 7 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 84e07b5..cd50365 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -535,6 +535,7 @@ status_t MPEG4Extractor::readMetaData() {
     }
     if (psshsize > 0 && psshsize <= UINT32_MAX) {
         char *buf = (char*)malloc(psshsize);
+        CHECK(buf != NULL);
         char *ptr = buf;
         for (size_t i = 0; i < mPssh.size(); i++) {
             memcpy(ptr, mPssh[i].uuid, 20); // uuid + length
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 7dfac76..8af2615 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -1566,6 +1566,7 @@ void MPEG4Writer::Track::getCodecSpecificDataFromInputFormatIfPossible() {
         size_t size;
         if (mMeta->findData(kKeyAVCC, &type, &data, &size)) {
             mCodecSpecificData = malloc(size);
+            CHECK(mCodecSpecificData != NULL);
             mCodecSpecificDataSize = size;
             memcpy(mCodecSpecificData, data, size);
             mGotAllCodecSpecificData = true;
@@ -1579,6 +1580,7 @@ void MPEG4Writer::Track::getCodecSpecificDataFromInputFormatIfPossible() {
             ESDS esds(data, size);
             if (esds.getCodecSpecificInfo(&data, &size) == OK) {
                 mCodecSpecificData = malloc(size);
+                CHECK(mCodecSpecificData != NULL);
                 mCodecSpecificDataSize = size;
                 memcpy(mCodecSpecificData, data, size);
                 mGotAllCodecSpecificData = true;
@@ -1979,6 +1981,7 @@ status_t MPEG4Writer::Track::copyAVCCodecSpecificData(
 
     mCodecSpecificDataSize = size;
     mCodecSpecificData = malloc(size);
+    CHECK(mCodecSpecificData != NULL);
     memcpy(mCodecSpecificData, data, size);
     return OK;
 }
@@ -2101,6 +2104,7 @@ status_t MPEG4Writer::Track::makeAVCCodecSpecificData(
     // ISO 14496-15: AVC file format
     mCodecSpecificDataSize += 7;  // 7 more bytes in the header
     mCodecSpecificData = malloc(mCodecSpecificDataSize);
+    CHECK(mCodecSpecificData != NULL);
     uint8_t *header = (uint8_t *)mCodecSpecificData;
     header[0] = 1;                     // version
     header[1] = mProfileIdc;           // profile indication
@@ -2235,6 +2239,7 @@ status_t MPEG4Writer::Track::threadEntry() {
             } else if (mIsMPEG4) {
                 mCodecSpecificDataSize = buffer->range_length();
                 mCodecSpecificData = malloc(mCodecSpecificDataSize);
+                CHECK(mCodecSpecificData != NULL);
                 memcpy(mCodecSpecificData,
                         (const uint8_t *)buffer->data()
                             + buffer->range_offset(),
diff --git a/media/libstagefright/MediaBuffer.cpp b/media/libstagefright/MediaBuffer.cpp
index 1f80a47..525a156 100644
--- a/media/libstagefright/MediaBuffer.cpp
+++ b/media/libstagefright/MediaBuffer.cpp
@@ -54,6 +54,7 @@ MediaBuffer::MediaBuffer(size_t size)
       mOwnsData(true),
       mMetaData(new MetaData),
       mOriginal(NULL) {
+    CHECK(mData != NULL);
 }
 
 MediaBuffer::MediaBuffer(const sp<GraphicBuffer>& graphicBuffer)
diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index 6fba8e1..c438d3c 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -1225,6 +1225,7 @@ static uint8_t *DecodeBase64(const char *s, size_t size, size_t *outSize) {
     *outSize = outLen;
 
     void *buffer = malloc(outLen);
+    CHECK(buffer != NULL);
 
     uint8_t *out = (uint8_t *)buffer;
     size_t j = 0;
diff --git a/media/libstagefright/foundation/ABuffer.cpp b/media/libstagefright/foundation/ABuffer.cpp
index a5b81a8..3ebbbd9 100644
--- a/media/libstagefright/foundation/ABuffer.cpp
+++ b/media/libstagefright/foundation/ABuffer.cpp
@@ -29,13 +29,9 @@ ABuffer::ABuffer(size_t capacity)
       mInt32Data(0),
       mOwnsData(true) {
     mData = malloc(capacity);
-    if (mData == NULL) {
-        mCapacity = 0;
-        mRangeLength = 0;
-    } else {
-        mCapacity = capacity;
-        mRangeLength = capacity;
-    }
+    CHECK(mData != NULL);
+    mCapacity = capacity;
+    mRangeLength = capacity;
 }
 
 ABuffer::ABuffer(void *data, size_t capacity)