Commit 1d8a77b6 authored Jul 18, 2017 by Chong Zhang Committed by android-build-merger Jul 18, 2017

Merge "stagefright: check aac_frame_length to prevent infinite loop" into...

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08b am: 98248c3f am: 5f3ac389 am: aafbda5a am: b226bba8 am: 8d579abf am: 2b1df000 am: b38111a0 am: fb7c6d91 am: ee1f4684 am: 8486817a am: 0ac01572 am: a06a7750 am: 24145427 am: 8a4f540b am: f62d2cf8
am: c3a8c93b

Change-Id: Ib638389b3b2240dfd7f8e8b9463fb12c1183bda6

media/libstagefright/mpeg2ts/ESQueue.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -892,6 +892,11 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitAAC() {
		bits.skipBits(2);

		unsigned aac_frame_length = bits.getBits(13);
		if (aac_frame_length == 0){
		ALOGE("b/62673179, Invalid AAC frame length!");
		android_errorWriteLog(0x534e4554, "62673179");
		return NULL;
		}

		bits.skipBits(11); // adts_buffer_fullness