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

Commit b553ce14 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am f9156653: Merge "libstagefright: sanity check size before dereferencing... 

am f9156653: Merge "libstagefright: sanity check size before dereferencing pointer in Utils.cpp" into mnc-dev

* commit 'f9156653':
  libstagefright: sanity check size before dereferencing pointer in Utils.cpp
parents 084b0de5 f9156653

media/libstagefright/Utils.cpp

+28 −8
Original line number Diff line number Diff line
@@ -211,8 +211,10 @@ status_t convertMetaDataToMessage( 


        const uint8_t *ptr = (const uint8_t *)data;



        CHECK(size >= 7);

        CHECK_EQ((unsigned)ptr[0], 1u);  // configurationVersion == 1

        if (size < 7 || ptr[0] != 1) {  // configurationVersion == 1

            ALOGE("b/23680780");

            return BAD_VALUE;

        }

        uint8_t profile __unused = ptr[1];

        uint8_t level __unused = ptr[3];
@@ -238,7 +240,10 @@ status_t convertMetaDataToMessage( 
        buffer->setRange(0, 0);



        for (size_t i = 0; i < numSeqParameterSets; ++i) {

            CHECK(size >= 2);

            if (size < 2) {

                ALOGE("b/23680780");

                return BAD_VALUE;

            }

            size_t length = U16_AT(ptr);



            ptr += 2;
@@ -267,13 +272,19 @@ status_t convertMetaDataToMessage( 
        }

        buffer->setRange(0, 0);



        CHECK(size >= 1);

        if (size < 1) {

            ALOGE("b/23680780");

            return BAD_VALUE;

        }

        size_t numPictureParameterSets = *ptr;

        ++ptr;

        --size;



        for (size_t i = 0; i < numPictureParameterSets; ++i) {

            CHECK(size >= 2);

            if (size < 2) {

                ALOGE("b/23680780");

                return BAD_VALUE;

            }

            size_t length = U16_AT(ptr);



            ptr += 2;
@@ -297,8 +308,10 @@ status_t convertMetaDataToMessage( 
    } else if (meta->findData(kKeyHVCC, &type, &data, &size)) {

        const uint8_t *ptr = (const uint8_t *)data;



        CHECK(size >= 7);

        CHECK_EQ((unsigned)ptr[0], 1u);  // configurationVersion == 1

        if (size < 23 || ptr[0] != 1) {  // configurationVersion == 1

            ALOGE("b/23680780");

            return BAD_VALUE;

        }

        uint8_t profile __unused = ptr[1] & 31;

        uint8_t level __unused = ptr[12];

        ptr += 22;
@@ -317,6 +330,10 @@ status_t convertMetaDataToMessage( 
        buffer->setRange(0, 0);



        for (i = 0; i < numofArrays; i++) {

            if (size < 3) {

                ALOGE("b/23680780");

                return BAD_VALUE;

            }

            ptr += 1;

            size -= 1;
@@ -327,7 +344,10 @@ status_t convertMetaDataToMessage( 
            size -= 2;



            for (j = 0; j < numofNals; j++) {

                CHECK(size >= 2);

                if (size < 2) {

                    ALOGE("b/23680780");

                    return BAD_VALUE;

                }

                size_t length = U16_AT(ptr);



                ptr += 2;