mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-06-08 00:10:30 +00:00
avcodec/flashsv: Check for input space before (re)allocating frame
Fixes: Timeout
Fixes: 471605680/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLASHSV2_DEC_fuzzer-6210773459468288
Fixes: 471605920/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLASHSV_DEC_fuzzer-6230719287590912
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 4446dfb0e3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
0b1b176361
commit
ffd7599c80
1 changed files with 3 additions and 0 deletions
|
|
@ -314,6 +314,9 @@ static int flashsv_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
|
|||
v_blocks = s->image_height / s->block_height;
|
||||
v_part = s->image_height % s->block_height;
|
||||
|
||||
if (h_blocks * v_blocks * 16 > get_bits_left(&gb))
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
/* the block size could change between frames, make sure the buffer
|
||||
* is large enough, if not, get a larger one */
|
||||
if (s->block_size < s->block_width * s->block_height) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue