diff options
| author | Lajos Molnar <lajos@google.com> | 2013-04-01 17:31:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-01 17:31:15 +0000 |
| commit | d49e54289654ab7d7bda03f019ca4421fe303b05 (patch) | |
| tree | d434446b2507c779610a7ad6f4119e5b92306307 | |
| parent | 2f711486c2b35610fb8e114968263e6660cdb683 (diff) | |
| parent | 7268396ee607804570d3ae5927d672894aa708b1 (diff) | |
| download | frameworks_av-d49e54289654ab7d7bda03f019ca4421fe303b05.zip frameworks_av-d49e54289654ab7d7bda03f019ca4421fe303b05.tar.gz frameworks_av-d49e54289654ab7d7bda03f019ca4421fe303b05.tar.bz2 | |
Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-dev
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 4 |
1 files 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; |