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

Commit 2b1df000 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

Change-Id: I91ae5b377da3c8b253ef481ec66646dfcc7fa590
parents 7da8bef6 8d579abf

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