commit f92300875743fca7e264c731a4e2fe9860cd1b10
author Lajos Molnar <lajos@google.com> Mon Apr 01 17:31:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 17:31:15 2013 +0000
tree afa21e8c6711b4e4a34bfc0733fc71d0cd48260c
parent 31215f2f341bae9d1f6db6368b2b1539e077d571
parent e467ef084b75b074d0081616080b54212a7024c8

Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-dev

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;