Unverified Commit f90a7fa8 authored Aug 04, 2022 by Kevin F. Haggerty

Merge tag 'android-security-11.0.0_r58' of...

Merge tag 'android-security-11.0.0_r58' of https://android.googlesource.com/platform/frameworks/av into staging/lineage-18.1_merge_android-security-11.0.0_r58

Android Security 11.0.0 Release 58 (8712617)

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

Change-Id: Id33a0f82d8b33e8fd9116b646ceae28d88c25772

parents 7a68d737 15afea54

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