Commit 19114217 authored May 19, 2022 by Santiago Seifert Committed by Android Build Coastguard Worker Jun 11, 2022

Avoid read out of bounds

Bug: 230493653
Change-Id: Ieca5a5390d3cf73fff6aa552d065363d84e1ccc2
Merged-In: Ieca5a5390d3cf73fff6aa552d065363d84e1ccc2
Test: See bug for PoC.
(cherry picked from commit 306aad77)
(cherry picked from commit 9d33304e)
Merged-In: Ieca5a5390d3cf73fff6aa552d065363d84e1ccc2

parent b0c8afd3

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