commit e467ef084b75b074d0081616080b54212a7024c8
author Lajos Molnar <lajos@google.com> Wed Mar 27 19:04:12 2013 -0700
committer Lajos Molnar <lajos@google.com> Wed Mar 27 20:12:49 2013 -0700
tree 2a1e22887679b1f20b9a960e4919535bdf8cee2a
parent 4b6ed7f255b696d1555ce71633ea08c961ec51dd

stagefright: matroska: don't crash on parsing error

MatroskaExtractor crashed with an assertion if mkvparser::ParseNext()
returned a negative number.  Now handle all error values the same
way as the EOF.

Change-Id: I173c4f878d692a0cbdb915ad1118d0686249d625
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 8433794

media/libstagefright/matroska/MatroskaExtractor.cpp

diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index 7fc7037..b304749 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -263,8 +263,8 @@
                     mCluster, nextCluster, pos, len);
             ALOGV("ParseNext returned %ld", res);
 
-            if (res > 0) {
-                // EOF
+            if (res != 0) {
+                // EOF or error
 
                 mCluster = NULL;
                 break;