diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-23 09:29:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-01 17:53:01 +0100 |
| commit | db659cdf47892e13b75facfd5407397ddd26c3b7 (patch) | |
| tree | 3167b5608a112239bb46e31a00db0d59d1a7a287 | |
| parent | ed4f4853533587fc9ca443f40e63a1cca3fd5aa1 (diff) | |
| download | ffmpeg-db659cdf47892e13b75facfd5407397ddd26c3b7.tar.gz | |
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>
(cherry picked from commit 1ca978d6366f3c7d7df6b3d50566e892f8da605a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/nuv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 6192a70c74..39f4e79ba0 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -131,10 +131,10 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, + RTJPEG_HEADER_SIZE; if (buf_size > INT_MAX/8) return -1; - if ((ret = av_image_check_size(height, width, 0, avctx)) < 0) + if ((ret = ff_set_dimensions(avctx, width, height)) < 0) return ret; - avctx->width = c->width = width; - avctx->height = c->height = height; + c->width = width; + c->height = height; av_fast_malloc(&c->decomp_buf, &c->decomp_size, buf_size); if (!c->decomp_buf) { |