ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun Oct 10 23:31:13 2021 +0200| [1902a60ddab82b0c8e8e52c6d2c329eb4628a7d9] | committer: Michael Niedermayer
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 <pr...@xvid.org> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1902a60ddab82b0c8e8e52c6d2c329eb4628a7d9 --- libavcodec/gemdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/gemdec.c b/libavcodec/gemdec.c index bf0927b763..2464dda8a7 100644 --- a/libavcodec/gemdec.c +++ b/libavcodec/gemdec.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
