commit 43dd56c0fde78ab09bf3606e8a49691378237be6
author android-build-team Robot <android-build-team-robot@google.com> Fri Aug 04 22:25:57 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Aug 04 22:25:57 2017 +0000
tree 88b666c4503639da9c238ea554c9113873a3b846
parent 434b97b495b1bed9f21785781e6a96669979c9d8
parent 5f56ec847a7f6250abd36a2f8a7b7baf4f966d11

Merge cherrypicks of [2666915] into nyc-mr1-security-e-release

Change-Id: I1cbd822cba6ea56a753d086d9d8714a9086fb48b

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 1dfa868..2cc43c1 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3795,7 +3795,8 @@
 
                 while (true) {
                     if (mDataSource->readAt(*offset, hdr, 8) < 8) {
-                        return ERROR_END_OF_STREAM;
+                        // no more box to the end of file.
+                        break;
                     }
                     chunk_size = ntohl(hdr[0]);
                     chunk_type = ntohl(hdr[1]);