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

avcodec/gdv: Check input palette size before rescale() 

Fixes: Timeout (22sec -> 11sec)
Fixes: 13576/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5681024577568768

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-04-25 19:18:08 +02:00
parent 1e01f66822
commit f857753f56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/gdv.c
View File

@ -475,6 +475,8 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
if (pal && pal_size == AVPALETTE_SIZE) if (pal && pal_size == AVPALETTE_SIZE)
memcpy(gdv->pal, pal, AVPALETTE_SIZE); memcpy(gdv->pal, pal, AVPALETTE_SIZE);
if (compression < 2 && bytestream2_get_bytes_left(gb) < 256*3)
return AVERROR_INVALIDDATA;
rescale(gdv, gdv->frame, avctx->width, avctx->height, rescale(gdv, gdv->frame, avctx->width, avctx->height,
!!(flags & 0x10), !!(flags & 0x20)); !!(flags & 0x10), !!(flags & 0x20));
@ -482,8 +484,6 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
case 1: case 1:
memset(gdv->frame + PREAMBLE_SIZE, 0, gdv->frame_size - PREAMBLE_SIZE); memset(gdv->frame + PREAMBLE_SIZE, 0, gdv->frame_size - PREAMBLE_SIZE);
case 0: case 0:
if (bytestream2_get_bytes_left(gb) < 256*3)
return AVERROR_INVALIDDATA;
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
unsigned r = bytestream2_get_byte(gb); unsigned r = bytestream2_get_byte(gb);
unsigned g = bytestream2_get_byte(gb); unsigned g = bytestream2_get_byte(gb);