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

Commit 15afea54 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [18492389] into security-aosp-rvc-release. 

Change-Id: I34c01c4017907358b3833efaed96e711e64b7ec4
parents b0c8afd3 19114217

media/extractors/mp4/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4573,7 +4573,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio( 
        if (len2 == 0) {

            return ERROR_MALFORMED;

        }

        if (offset >= csd_size || csd[offset] != 0x01) {

        if (offset + len1 > csd_size || csd[offset] != 0x01) {

            return ERROR_MALFORMED;

        }

        // formerly kKeyVorbisInfo