[FFmpeg-cvslog] avcodec/vp3: Check that theora is theora
Michael Niedermayer
git at videolan.org
Sat Aug 3 18:11:54 EEST 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 22 00:41:06 2019 +0200| [b4bf7226aff28e9ca379c5a3dedf745a2d316739] | committer: Michael Niedermayer
avcodec/vp3: Check that theora is theora
Theora is forced to be non zero if it is zero and a sample
is asked for, as suggested by reimar
Fixes: Timeout (2min -> 600ms)
Fixes: 15366/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-5737849938247680
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4bf7226aff28e9ca379c5a3dedf745a2d316739
---
libavcodec/vp3.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index a6f759ebf5..6ce901eda9 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2957,6 +2957,10 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
s->theora_header = 0;
s->theora = get_bits_long(gb, 24);
av_log(avctx, AV_LOG_DEBUG, "Theora bitstream version %X\n", s->theora);
+ if (!s->theora) {
+ s->theora = 1;
+ avpriv_request_sample(s->avctx, "theora 0");
+ }
/* 3.2.0 aka alpha3 has the same frame orientation as original vp3
* but previous versions have the image flipped relative to vp3 */
More information about the ffmpeg-cvslog
mailing list