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

Commit b2e7ceb8 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a0 am:... 

Merge "Check section size when verifying CRC" into mnc-dev am: fd9e18a0 am: 4a46a277 am: 8f53b71b
am: c920b2c2

* commit 'c920b2c2':
  Check section size when verifying CRC

Change-Id: I6ef0f68ff63469c1e6da0b7eab3fe946058573ac
parents 26583ffe c920b2c2

media/libstagefright/mpeg2ts/ATSParser.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1734,6 +1734,13 @@ bool ATSParser::PSISection::isCRCOkay() const { 
    unsigned sectionLength = U16_AT(data + 1) & 0xfff;

    ALOGV("sectionLength %u, skip %u", sectionLength, mSkipBytes);





    if(sectionLength < mSkipBytes) {

        ALOGE("b/28333006");

        android_errorWriteLog(0x534e4554, "28333006");

        return false;

    }



    // Skip the preceding field present when payload start indicator is on.

    sectionLength -= mSkipBytes;