From 7268396ee607804570d3ae5927d672894aa708b1 Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Wed, 27 Mar 2013 19:04:12 -0700
Subject: 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@ void BlockIterator::advance_l() {
                     mCluster, nextCluster, pos, len);
             ALOGV("ParseNext returned %ld", res);
 
-            if (res > 0) {
-                // EOF
+            if (res != 0) {
+                // EOF or error
 
                 mCluster = NULL;
                 break;
-- 
cgit v1.1