commit e8847a53467937c182848f7ba7d6a7416d3905e4
author android-build-team Robot <android-build-team-robot@google.com> Fri Aug 04 21:25:18 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Aug 04 21:25:18 2017 +0000
tree 88b666c4503639da9c238ea554c9113873a3b846
parent 270dd2a1f4e4d118d6707ad496a558082f4ecd45
parent 6701dd3b3201404ad4d0ee9560296e6f18fc6f6c

Merge cherrypicks of [2666758] into nyc-mr1-security-a-release

Change-Id: I57484724edbf47e867315ce445015ea810e5df21

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]);