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

avcodec/nuv: Use ff_set_dimensions() 

Fixes: OOM
Fixes: 18956/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-5766505644163072

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-11-23 09:29:58 +01:00
parent d83002179f
commit 1ca978d636
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/nuv.c
View File

@ -131,10 +131,10 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height,
+ RTJPEG_HEADER_SIZE; + RTJPEG_HEADER_SIZE;
if (buf_size > INT_MAX/8) if (buf_size > INT_MAX/8)
return -1; return -1;
if ((ret = av_image_check_size(height, width, 0, avctx)) < 0) if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
return ret; return ret;
avctx->width = c->width = width; c->width = width;
avctx->height = c->height = height; c->height = height;
av_fast_malloc(&c->decomp_buf, &c->decomp_size, av_fast_malloc(&c->decomp_buf, &c->decomp_size,
buf_size); buf_size);
if (!c->decomp_buf) { if (!c->decomp_buf) {