virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avcodec/tiff: Use ff_set_dimensions() for setting up mjpeg context dimensions

Browse Source 
sets coded_width / coded_height too to keep them consistent with
width / height

Fixes: OOM
Fixes: 42263/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5653333619113984

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-12-17 20:52:32 +01:00
parent d6c16f42cc
commit cfa1f0e214
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/tiff.c
View File

@ -724,13 +724,14 @@ static int dng_decode_jpeg(AVCodecContext *avctx, AVFrame *frame,
static int dng_decode_strip(AVCodecContext *avctx, AVFrame *frame)
{
TiffContext *s = avctx->priv_data;
int ret = ff_set_dimensions(s->avctx_mjpeg, s->width, s->height);
if (ret < 0)
return ret;
s->jpgframe->width = s->width;
s->jpgframe->height = s->height;
s->avctx_mjpeg->width = s->width;
s->avctx_mjpeg->height = s->height;
return dng_decode_jpeg(avctx, frame, s->stripsize, 0, 0, s->width, s->height);
}
@ -971,14 +972,14 @@ static int dng_decode_tiles(AVCodecContext *avctx, AVFrame *frame,
int has_width_leftover, has_height_leftover;
int tile_x = 0, tile_y = 0;
int pos_x = 0, pos_y = 0;
int ret;
int ret = ff_set_dimensions(s->avctx_mjpeg, s->tile_width, s->tile_length);
if (ret < 0)
return ret;
s->jpgframe->width = s->tile_width;
s->jpgframe->height = s->tile_length;
s->avctx_mjpeg->width = s->tile_width;
s->avctx_mjpeg->height = s->tile_length;
has_width_leftover = (s->width % s->tile_width != 0);
has_height_leftover = (s->height % s->tile_length != 0);