commit afce2158a26a7aca66a6ea8344cc7bc73ab965d3
author Andreas Huber <andih@google.com> Mon Jan 11 14:21:26 2010 -0800
committer Andreas Huber <andih@google.com> Mon Jan 11 14:21:26 2010 -0800
tree bb8a1855c3551fe31883f3d6dd8f809c5d05f951
parent 3b06c9f3dda91dbbf567f3163da1ac9648221f14

The mp3 decoder should not assert that decoding was successful but return an error instead.

media/libstagefright/codecs/mp3dec/MP3Decoder.cpp

diff --git a/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp b/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp
index 2f919c2..c115b18 100644
--- a/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp
+++ b/media/libstagefright/codecs/mp3dec/MP3Decoder.cpp
@@ -160,7 +160,12 @@
     mConfig->outputFrameSize = buffer->size() / sizeof(int16_t);
     mConfig->pOutputBuffer = static_cast<int16_t *>(buffer->data());
 
-    CHECK_EQ(pvmp3_framedecoder(mConfig, mDecoderBuf), NO_DECODING_ERROR);
+    if (pvmp3_framedecoder(mConfig, mDecoderBuf) != NO_DECODING_ERROR) {
+        mInputBuffer->release();
+        mInputBuffer = NULL;
+
+        return UNKNOWN_ERROR;
+    }
 
     buffer->set_range(
             0, mConfig->outputFrameSize * sizeof(int16_t));