Merge cherrypicks of [18993507] into security-aosp-rvc-release.

Change-Id: I4e3b150d27093cecdc4fbfd7c9c0e5408c281053

media/libstagefright/timedtext/TextDescriptions.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -466,6 +466,10 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions(

		if (subChunkType == FOURCC('f', 't', 'a', 'b'))
		{
		if(subChunkSize < 8) {
		return OK;
		}

		tmpData += 8;
		size_t subChunkRemaining = subChunkSize - 8;