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

Commit 017c35af authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 56b87a46: am 21f633e1: am bf42e44c: am 6f14568b: am f1790258: am 5e92fded:... 

am 56b87a46: am 21f633e1: am bf42e44c: am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev

* commit '56b87a46':
  Check NAL size before use
parents b7a01608 56b87a46

media/libstagefright/MPEG4Extractor.cpp

+9 −2
Original line number Diff line number Diff line
@@ -4201,7 +4201,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();
@@ -4488,7 +4491,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();