commit 464c7e085b68dd63ce8cdbb2c389d3827f8d586a
author Marco Nelissen <marcone@google.com> Tue May 05 20:28:58 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 05 20:28:59 2015 +0000
tree e19af9a7a20d0c75261137c7cc44a1a08ae80329
parent 8b07404cfe564885045a63bb592d6b6dc838b408
parent fe7186bb1567b5725eb8ce61e3267a1733e90c53

Merge "OggExtractor::verifyHeader: return errors instead of asserting" into mnc-dev

media/libstagefright/OggExtractor.cpp

diff --git a/media/libstagefright/OggExtractor.cpp b/media/libstagefright/OggExtractor.cpp
index d577034..4297549 100644
--- a/media/libstagefright/OggExtractor.cpp
+++ b/media/libstagefright/OggExtractor.cpp
@@ -753,7 +753,9 @@
     oggpack_buffer bits;
     oggpack_readinit(&bits, &ref);
 
-    CHECK_EQ(oggpack_read(&bits, 8), type);
+    if (oggpack_read(&bits, 8) != type) {
+        return ERROR_MALFORMED;
+    }
     for (size_t i = 0; i < 6; ++i) {
         oggpack_read(&bits, 8);  // skip 'vorbis'
     }
@@ -761,7 +763,9 @@
     switch (type) {
         case 1:
         {
-            CHECK_EQ(0, _vorbis_unpack_info(&mVi, &bits));
+            if (0 != _vorbis_unpack_info(&mVi, &bits)) {
+                return ERROR_MALFORMED;
+            }
 
             mMeta->setData(kKeyVorbisInfo, 0, data, size);
             mMeta->setInt32(kKeySampleRate, mVi.rate);