| commit | d20e1f932277eed35f9ec423f134b4a60b8f9b85 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Fri Feb 17 13:52:10 2017 -0800 |
| committer | Wei Jia <wjia@google.com> | Fri Feb 17 16:13:34 2017 -0800 |
| tree | d64b1c88b88f243fbf3a07d5d19ed375bcd68a49 | |
| parent | 8eacd8090e16c022dcbb11850cff83f984fe2357 [diff] |
MPEG4Extractor: allow empty atom in iTune meta. Test: can decode mp4 file with empty "name" atom. Bug: 34718515 Change-Id: I0c4ee85ad9c8a8c31b6c58296f6eca4f62c30fef
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 87d7d3c..07c8e4a 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2792,6 +2792,10 @@ } status_t MPEG4Extractor::parseITunesMetaData(off64_t offset, size_t size) { + if (size == 0) { + return OK; + } + if (size < 4 || size == SIZE_MAX) { return ERROR_MALFORMED; }