diff options
| author | Marco Nelissen <marcone@google.com> | 2015-05-05 20:28:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 20:28:59 +0000 |
| commit | 464c7e085b68dd63ce8cdbb2c389d3827f8d586a (patch) | |
| tree | e19af9a7a20d0c75261137c7cc44a1a08ae80329 | |
| parent | 8b07404cfe564885045a63bb592d6b6dc838b408 (diff) | |
| parent | fe7186bb1567b5725eb8ce61e3267a1733e90c53 (diff) | |
| download | frameworks_av-464c7e085b68dd63ce8cdbb2c389d3827f8d586a.zip frameworks_av-464c7e085b68dd63ce8cdbb2c389d3827f8d586a.tar.gz frameworks_av-464c7e085b68dd63ce8cdbb2c389d3827f8d586a.tar.bz2 | |
Merge "OggExtractor::verifyHeader: return errors instead of asserting" into mnc-dev
| -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); |