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

Commit 9897bd43 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev 

am: fddbb1a7

* commit 'fddbb1a7':
  DO NOT MERGE Check malloc result to avoid NPD

Change-Id: Idf65c8e5520e1c2a4571ea434f0114ae13334e7b
parents 883b244f fddbb1a7

media/libstagefright/MPEG4Extractor.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -521,6 +521,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
@@ -1572,6 +1576,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;
@@ -1788,6 +1797,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;