diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-14 20:31:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:21 +0200 |
| commit | aee47eb6e2e3d35b7506988a97a2b7e3ae2b507e (patch) | |
| tree | 5e136b16ea982de4d019d387de14efad6058192f | |
| parent | 2d766961b078e574a35497b2ed987f0d227b45f1 (diff) | |
| download | ffmpeg-aee47eb6e2e3d35b7506988a97a2b7e3ae2b507e.tar.gz | |
avcodec/flicvideo: Check remaining bytes in FLI*COPY
Fixes: Timeout
Fixes: 37795/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLIC_fuzzer-4846536543043584
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5f835efbca874ad42cb954e6788588f52a57a7a2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/flicvideo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 5c66d225bc..49d0e1c010 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -734,6 +734,8 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, bytestream2_skip(&g2, chunk_size - 6); } else { + if (bytestream2_get_bytes_left(&g2) < 2 * s->avctx->width * s->avctx->height ) + return AVERROR_INVALIDDATA; for (y_ptr = 0; y_ptr < s->frame->linesize[0] * s->avctx->height; y_ptr += s->frame->linesize[0]) { |