diff options
| author | Johannes Schickel | 2010-02-03 09:47:29 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-02-03 09:47:29 +0000 |
| commit | d32dfa3bb3df8e1b2b4fb9d146a0affe2c2be814 (patch) | |
| tree | e7a60a933ddf7e6ad00caffa8909556e5e8c079f | |
| parent | 8ae24a27b3f6cb2272fd7c732c8583623c8164f4 (diff) | |
| download | scummvm-rg350-d32dfa3bb3df8e1b2b4fb9d146a0affe2c2be814.tar.gz scummvm-rg350-d32dfa3bb3df8e1b2b4fb9d146a0affe2c2be814.tar.bz2 scummvm-rg350-d32dfa3bb3df8e1b2b4fb9d146a0affe2c2be814.zip | |
Make makeMP3Stream return 0 on failure too.
svn-id: r47848
| -rw-r--r-- | sound/decoders/mp3.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/decoders/mp3.cpp b/sound/decoders/mp3.cpp index ba49900c49..2178cc86ac 100644 --- a/sound/decoders/mp3.cpp +++ b/sound/decoders/mp3.cpp @@ -338,8 +338,13 @@ int MP3Stream::readBuffer(int16 *buffer, const int numSamples) { SeekableAudioStream *makeMP3Stream( Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse) { - // TODO: Properly check whether creating the MP3 stream succeeded. - return new MP3Stream(stream, disposeAfterUse); + SeekableAudioStream *s = new MP3Stream(stream, disposeAfterUse); + if (s && s->endOfData()) { + delete s; + return 0; + } else { + return s; + } } } // End of namespace Audio |