Commit d8aff827 authored Jan 23, 2015 by Robert Shih Committed by Android Git Automerger Jan 23, 2015

am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1-dev

* commit 'ddc1216d':
  MPEG4Extractor: more NULL derefernce fixes in parseChunk
  do not use paused postition if it's not available
  Use aligned width and height to compute size.

parents 0fe24de8 ddc1216d

media/libstagefright/MPEG4Extractor.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1144,7 +1144,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		{
		*offset += chunk_size;

		if (chunk_data_size < 4) {
		if (chunk_data_size < 4 \|\| mLastTrack == NULL) {
		return ERROR_MALFORMED;
		}