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

Commit 74d1927e authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Check NAL size before use" into klp-dev

parents 9ab9c85e 5d101298

media/libstagefright/MPEG4Extractor.cpp

+9 −2
Original line number Diff line number Diff line
@@ -3299,7 +3299,10 @@ status_t MPEG4Source::read( 
            (const uint8_t *)mBuffer->data() + mBuffer->range_offset();



        size_t nal_size = parseNALSize(src);

        if (mBuffer->range_length() < mNALLengthSize + nal_size) {

        if (mNALLengthSize > SIZE_MAX - nal_size) {

            ALOGE("b/24441553, b/24445122");

        }

        if (mBuffer->range_length() - mNALLengthSize < nal_size) {

            ALOGE("incomplete NAL unit.");



            mBuffer->release();
@@ -3572,7 +3575,11 @@ status_t MPEG4Source::fragmentedRead( 
            (const uint8_t *)mBuffer->data() + mBuffer->range_offset();



        size_t nal_size = parseNALSize(src);

        if (mBuffer->range_length() < mNALLengthSize + nal_size) {

        if (mNALLengthSize > SIZE_MAX - nal_size) {

            ALOGE("b/24441553, b/24445122");

        }



        if (mBuffer->range_length() - mNALLengthSize < nal_size) {

            ALOGE("incomplete NAL unit.");



            mBuffer->release();