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

Commit fb7c6d91 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "stagefright: check aac_frame_length to prevent infinite loop" into... 

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08b am: 98248c3f am: 5f3ac389 am: aafbda5a am: b226bba8 am: 8d579abf am: 2b1df000
am: b38111a0

Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc
parents 0b542a37 b38111a0

media/libstagefright/mpeg2ts/ESQueue.cpp

+5 −0
Original line number Diff line number Diff line
@@ -715,6 +715,11 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitAAC() { 
        bits.skipBits(2);



        unsigned aac_frame_length = bits.getBits(13);

        if (aac_frame_length == 0){

            ALOGE("b/62673179, Invalid AAC frame length!");

            android_errorWriteLog(0x534e4554, "62673179");

            return NULL;

        }



        bits.skipBits(11);  // adts_buffer_fullness