commit 0d13824315b0491d44e9c6eb5db06489ab0fcc20
author Marco Nelissen <marcone@google.com> Thu Oct 06 15:31:52 2016 -0700
committer Marco Nelissen <marcone@google.com> Thu Oct 06 22:50:30 2016 +0000
tree db7c89355b36f62897e36124a5a2377ccfc741cd
parent 4a5ef2e42a0e67db1e18f8223807b8008e68ae08

Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32

media/libmedia/IMediaExtractor.cpp

diff --git a/media/libmedia/IMediaExtractor.cpp b/media/libmedia/IMediaExtractor.cpp
index e8ad75b..72d1d7c 100644
--- a/media/libmedia/IMediaExtractor.cpp
+++ b/media/libmedia/IMediaExtractor.cpp
@@ -160,6 +160,9 @@
             if (data.readUint32(&idx) == NO_ERROR &&
                     data.readUint32(&flags) == NO_ERROR) {
                 sp<MetaData> meta = getTrackMetaData(idx, flags);
+                if (meta == NULL) {
+                    return UNKNOWN_ERROR;
+                }
                 meta->writeToParcel(*reply);
                 return NO_ERROR;
             }