Commit 48bdf782 authored Aug 18, 2015 by Neel Mehta Committed by Android Git Automerger Aug 18, 2015

am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption...

am 00887af1: am e9a8362e: am a2a68264: am c37f7f6f: Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

* commit '00887af1':
  Fix for memory corruption in ID3::removeUnsynchronizationV2_4(). Bug: 23227354

parents 8b0660e0 00887af1

media/libstagefright/id3/ID3.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ bool ID3::removeUnsynchronizationV2_4(bool iTunesHack) {
		if (flags & 1) {
		// Strip data length indicator

		if (mSize < 14 \|\| mSize - 14 < offset) {
		if (mSize < 14 \|\| mSize - 14 < offset \|\| dataSize < 4) {
		return false;
		}
		memmove(&mData[offset + 10], &mData[offset + 14], mSize - offset - 14);