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

Unverified Commit 254dd62e authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-10.0.0_r69' of... 

Merge tag 'android-security-10.0.0_r69' of https://android.googlesource.com/platform/frameworks/av into staging/lineage-17.1_merge_android-security-10.0.0_r69

Android Security 10.0.0 Release 69 (8712615)

* tag 'android-security-10.0.0_r69' of https://android.googlesource.com/platform/frameworks/av:
  Avoid read out of bounds

Change-Id: I6dafb852bdc84681a993a2c154b2f2346f37f9d8
parents a565c220 9f25e5d3

media/extractors/mp4/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4364,7 +4364,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