Commit c17a483a 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 am: e44b6c78
am: 6ea9da93

Change-Id: I556adbb0d70058548e844baa6c9169d22790d6ba

parents 35cce3f4 6ea9da93

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) {