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

Commit e863b709 authored by Robert Shih's avatar Robert Shih Committed by Android Git Automerger
Browse files

am 88db1a0a: am 1471e7a1: Merge "MPEG2PSExtractor: check number of bits left... 

am 88db1a0a: am 1471e7a1: Merge "MPEG2PSExtractor: check number of bits left before skipping" into mnc-dev

* commit '88db1a0a':
  MPEG2PSExtractor: check number of bits left before skipping
parents 7ca3db70 88db1a0a

media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -505,6 +505,10 @@ ssize_t MPEG2PSExtractor::dequeuePES() { 
            optional_bytes_remaining -= 3;

        }



        if (br.numBitsLeft() < optional_bytes_remaining * 8) {

            return ERROR_MALFORMED;

        }



        br.skipBits(optional_bytes_remaining * 8);



        // ES data follows.