Commit e44b6c78 authored May 31, 2019 by Marco Nelissen Committed by android-build-merger May 31, 2019

[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1...

[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1 am: efeff077 am: 93e7dd1e am: 0d6a0e7d am: ec9f664d
am: 806e1cbf

Change-Id: If8f647ff59b17f9cecae2ca70f289d37a24ff318

parents d13505b1 806e1cbf

media/libstagefright/timedtext/TextDescriptions.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -383,7 +383,7 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions(
		tmpData += 8;
		size_t remaining = size - 8;

		if (size < chunkSize) {
		if (chunkSize <= 8 \|\| size < chunkSize) {
		return OK;
		}
		switch(chunkType) {