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

Commit 07c906d8 authored by Neel Mehta's avatar Neel Mehta Committed by Android (Google) Code Review
Browse files

Merge "Retry on broken fix for OOB read in... 

Merge "Retry on broken fix for OOB read in ElementaryStreamQueue::dequeueAccessUnitMPEGVideo(). Bug: 23221340"
parents ae9494bb 30cfe1d7

media/libstagefright/mpeg2ts/ESQueue.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1121,6 +1121,10 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitMPEGVideo() { 


        if (mFormat != NULL && currentStartCode == 0xb8) {

            // GOP layer

            if (offset + 7 >= size) {

                ALOGE("Size too small");

                return NULL;

            }

            gopFound = true;

            isClosedGop = (data[offset + 7] & 0x40) != 0;

            brokenLink = (data[offset + 7] & 0x20) != 0;