Commit 91c71293 authored Aug 18, 2015 by Wei Jia Committed by Android Git Automerger Aug 18, 2015

am 91fc84f2: am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright:...

am 91fc84f2: am de5c4c46: am 43131299: am 1a09d352: Merge "libstagefright: check remaining data size before parsing it." into klp-dev

* commit '91fc84f2':
  libstagefright: check remaining data size before parsing it.

parents cc3411e3 91fc84f2

media/libstagefright/id3/ID3.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,9 @@ void ID3::Iterator::getstring(String8 *id, bool otherdata) const {
		return;
		}

		if (mFrameSize < getHeaderLength() + 1) {
		return;
		}
		size_t n = mFrameSize - getHeaderLength() - 1;
		if (otherdata) {
		// skip past the encoding, language, and the 0 separator