har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/dds: Use ff_set_dimensions()

Browse Source 
Fixes: signed integer overflow: 2082471995 * 36 cannot be represented in type 'int'
Fixes: 16025/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DDS_fuzzer-5136663778426880

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-08-10 23:09:49 +02:00
parent 1d72b5d2d5
commit 9cd1e939cf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/dds.c
View File

@ -613,6 +613,7 @@ static int dds_decode(AVCodecContext *avctx, void *data,
AVFrame *frame = data; AVFrame *frame = data;
int mipmap; int mipmap;
int ret; int ret;
int width, height;
ff_texturedsp_init(&ctx->texdsp); ff_texturedsp_init(&ctx->texdsp);
bytestream2_init(gbc, avpkt->data, avpkt->size); bytestream2_init(gbc, avpkt->data, avpkt->size);
@ -631,9 +632,9 @@ static int dds_decode(AVCodecContext *avctx, void *data,
bytestream2_skip(gbc, 4); // flags bytestream2_skip(gbc, 4); // flags
avctx->height = bytestream2_get_le32(gbc); height = bytestream2_get_le32(gbc);
avctx->width = bytestream2_get_le32(gbc); width = bytestream2_get_le32(gbc);
ret = av_image_check_size(avctx->width, avctx->height, 0, avctx); ret = ff_set_dimensions(avctx, width, height);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid image size %dx%d.\n", av_log(avctx, AV_LOG_ERROR, "Invalid image size %dx%d.\n",
avctx->width, avctx->height); avctx->width, avctx->height);