RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/gemdec: Use ff_set_dimensions() 

Fixes: OOM
Fixes: 39798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GEM_fuzzer-5611636853964800

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-10-10 23:31:13 +02:00
parent 17e36fac0b
commit 1902a60dda
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/gemdec.c
View File

@ -101,6 +101,7 @@ static int gem_decode_frame(AVCodecContext *avctx,
int row_width, pixel_size;
State state = {.y = 0, .pl = 0, .x = 0, .vdup = 1};
void (*put_lines)(AVCodecContext *avctx, int planes, int row_width, int pixel_size, State * state, uint8_t * row, AVFrame *p);
int width, height;
if (buf_size <= 16)
return AVERROR_INVALIDDATA;
@ -114,8 +115,11 @@ static int gem_decode_frame(AVCodecContext *avctx,
pattern_size = bytestream2_get_be16(&gb);
avctx->sample_aspect_ratio.num = bytestream2_get_be16(&gb);
avctx->sample_aspect_ratio.den = bytestream2_get_be16(&gb);
avctx->width = bytestream2_get_be16(&gb);
avctx->height = bytestream2_get_be16(&gb);
width = bytestream2_get_be16(&gb);
height = bytestream2_get_be16(&gb);
ret = ff_set_dimensions(avctx, width, height);
if (ret < 0)
return ret;
row_width = (avctx->width + 7) / 8;
put_lines = put_lines_bits;