commit 9b2cd918052fdfda587c45b7b2b9a9e132ce6b7b
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 18 02:24:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 18 02:25:00 2017 +0000
tree 95fa1c5307536b8570af43aa9745bbaf17ae24a3
parent a146a0c499e53a4f064777ab2b45407c14429fa0
parent d20e1f932277eed35f9ec423f134b4a60b8f9b85

Merge "MPEG4Extractor: allow empty atom in iTune meta."

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index a7926cd..70916dc 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2814,6 +2814,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;
     }