Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d455478 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Check malloc result to avoid NPD" into lmp-dev am: e5734d88 am: f6e3609d 

am: 6d1da7d5

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

Change-Id: I92303d3c07ff920a4c7e2d1a94bd341102035ba1
parents f518e501 6d1da7d5

media/libstagefright/MPEG4Extractor.cpp

+18 −0
Original line number Original line Diff line number Diff line
@@ -545,6 +545,10 @@ status_t MPEG4Extractor::readMetaData() { 
    }

    }

    if (psshsize) {

    if (psshsize) {

        char *buf = (char*)malloc(psshsize);

        char *buf = (char*)malloc(psshsize);

        if (!buf) {

            ALOGE("b/28471206");

            return NO_MEMORY;

        }

        char *ptr = buf;

        char *ptr = buf;

        for (size_t i = 0; i < mPssh.size(); i++) {

        for (size_t i = 0; i < mPssh.size(); i++) {

            memcpy(ptr, mPssh[i].uuid, 20); // uuid + length

            memcpy(ptr, mPssh[i].uuid, 20); // uuid + length
@@ -1643,6 +1647,11 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 




            sp<ABuffer> buffer = new ABuffer(chunk_data_size);

            sp<ABuffer> buffer = new ABuffer(chunk_data_size);





            if (buffer->data() == NULL) {

                ALOGE("b/28471206");

                return NO_MEMORY;

            }



            if (mDataSource->readAt(

            if (mDataSource->readAt(

                        data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {

                        data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {

                return ERROR_IO;

                return ERROR_IO;
@@ -1657,6 +1666,11 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
        {

        {

            sp<ABuffer> buffer = new ABuffer(chunk_data_size);

            sp<ABuffer> buffer = new ABuffer(chunk_data_size);





            if (buffer->data() == NULL) {

                ALOGE("b/28471206");

                return NO_MEMORY;

            }



            if (mDataSource->readAt(

            if (mDataSource->readAt(

                        data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {

                        data_offset, buffer->data(), chunk_data_size) < chunk_data_size) {

                return ERROR_IO;

                return ERROR_IO;
@@ -1959,6 +1973,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                    return ERROR_MALFORMED;

                    return ERROR_MALFORMED;

                }

                }

                sp<ABuffer> buffer = new ABuffer(chunk_data_size + 1);

                sp<ABuffer> buffer = new ABuffer(chunk_data_size + 1);

                if (buffer->data() == NULL) {

                    ALOGE("b/28471206");

                    return NO_MEMORY;

                }

                if (mDataSource->readAt(

                if (mDataSource->readAt(

                    data_offset, buffer->data(), chunk_data_size) != (ssize_t)chunk_data_size) {

                    data_offset, buffer->data(), chunk_data_size) != (ssize_t)chunk_data_size) {

                    return ERROR_IO;

                    return ERROR_IO;