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

Commit 30890210 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when... 

am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS." into klp-dev

* commit '333ceb4f':
  DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
parents 1bfb8f76 333ceb4f

media/libstagefright/httplive/PlaylistFetcher.cpp

+12 −0
Original line number Diff line number Diff line
@@ -1321,6 +1321,18 @@ status_t PlaylistFetcher::extractAndQueueAccessUnits( 
            | (adtsHeader[4] << 3)

            | (adtsHeader[5] >> 5);



        if (aac_frame_length == 0) {

            const uint8_t *id3Header = adtsHeader;

            if (!memcmp(id3Header, "ID3", 3)) {

                ID3 id3(id3Header, buffer->size() - offset, true);

                if (id3.isValid()) {

                    offset += id3.rawSize();

                    continue;

                };

            }

            return ERROR_MALFORMED;

        }



        CHECK_LE(offset + aac_frame_length, buffer->size());



        sp<ABuffer> unit = new ABuffer(aac_frame_length);