Message ID | 20190429232910.29714-1-michael@niedermayer.cc |
---|---|
State | Accepted |
Commit | 8d77debf7dab556b93ea9e936a7762b8e31420ac |
Headers | show |
On Tue, Apr 30, 2019 at 01:29:10AM +0200, Michael Niedermayer wrote: > Fixes: Timeout (11sec -> 2sec) > Fixes: 14403/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PAF_VIDEO_fuzzer-5697465698746368 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/pafvideo.c | 4 ++++ > 1 file changed, 4 insertions(+) will apply [...]
diff --git a/libavcodec/pafvideo.c b/libavcodec/pafvideo.c index 7c5861dfaf..7bfd6815df 100644 --- a/libavcodec/pafvideo.c +++ b/libavcodec/pafvideo.c @@ -285,6 +285,10 @@ static int paf_video_decode(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } + if ((code & 0xF) == 0 && + c->video_size / 32 - (int64_t)bytestream2_get_bytes_left(&c->gb) > c->video_size / 32 * (int64_t)avctx->discard_damaged_percentage / 100) + return AVERROR_INVALIDDATA; + if ((ret = ff_reget_buffer(avctx, c->pic)) < 0) return ret;
Fixes: Timeout (11sec -> 2sec) Fixes: 14403/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PAF_VIDEO_fuzzer-5697465698746368 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/pafvideo.c | 4 ++++ 1 file changed, 4 insertions(+)