From ef185e94ce624146e3b1f3cbdb2404e833a0f81d Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Wed, 15 Apr 2015 12:23:10 -0700 Subject: skip parsing of 'hdlr' atom when parsing QT meta bug: 20244718 Change-Id: Ifb8a6d450a2f1ad2833301f492dc0ccfe1cd34d4 --- media/libstagefright/MPEG4Extractor.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'media') diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 297a186..28a9ed9 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -745,7 +745,8 @@ static bool underQTMetaPath(const Vector &path, int32_t depth) { && path[1] == FOURCC('m', 'e', 't', 'a') && (depth == 2 || (depth == 3 - && (path[2] == FOURCC('i', 'l', 's', 't') + && (path[2] == FOURCC('h', 'd', 'l', 'r') + || path[2] == FOURCC('i', 'l', 's', 't') || path[2] == FOURCC('k', 'e', 'y', 's')))); } @@ -1914,6 +1915,10 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { { *offset += chunk_size; + if (underQTMetaPath(mPath, 3)) { + break; + } + uint32_t buffer; if (mDataSource->readAt( data_offset + 8, &buffer, 4) < 4) { -- cgit v1.1