diff options
| -rw-r--r-- | media/libstagefright/OggExtractor.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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 @@ status_t MyVorbisExtractor::verifyHeader( 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 @@ status_t MyVorbisExtractor::verifyHeader( 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); |