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

Commit 2565811c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Crash by invalid ac4 field of mp4 file in fuzzy test" into rvc-dev am:... 

Merge "Crash by invalid ac4 field of mp4 file in fuzzy test" into rvc-dev am: bc9c9b7b am: 7706648f

Change-Id: Id01ea6466a6fc2bf6047a2676800bfae9d6b7426
parents 855e9dea 7706648f

media/extractors/mp4/AC4Parser.cpp

+4 −0
Original line number Diff line number Diff line
@@ -600,6 +600,10 @@ bool AC4DSIParser::parse() { 
        if (ac4_dsi_version == 1) {

            uint64_t end = (mDSISize - mBitReader.numBitsLeft()) / 8;

            uint64_t presentation_bytes = end - start;

            if (pres_bytes < presentation_bytes) {

                ALOGE("pres_bytes is smaller than presentation_bytes.");

                return false;

            }

            uint64_t skip_bytes = pres_bytes - presentation_bytes;

            ALOGV("skipping = %" PRIu64 " bytes", skip_bytes);

            CHECK_BITS_LEFT(skip_bytes * 8);