virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/gdv: Check compression before allocating frame

Browse Source 
Fixes: 2926/clusterfuzz-testcase-4987110014582784

This reduces decoding time from 7 to 4 seconds

The timeout should have been fixed in 0561bd2fc2 but ossfuzz did not close this issue

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 2017-11-01 20:02:59 +01:00
parent 48d77d5cd4
commit cf5a6c754a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/gdv.c
View File

@ -409,17 +409,20 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
unsigned flags; unsigned flags;
uint8_t *dst; uint8_t *dst;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
if (pal && pal_size == AVPALETTE_SIZE)
memcpy(gdv->pal, pal, AVPALETTE_SIZE);
bytestream2_init(gb, avpkt->data, avpkt->size); bytestream2_init(gb, avpkt->data, avpkt->size);
bytestream2_init_writer(pb, gdv->frame, gdv->frame_size); bytestream2_init_writer(pb, gdv->frame, gdv->frame_size);
flags = bytestream2_get_le32(gb); flags = bytestream2_get_le32(gb);
compression = flags & 0xF; compression = flags & 0xF;
if (compression == 4 || compression == 7 || compression > 8)
return AVERROR_INVALIDDATA;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
if (pal && pal_size == AVPALETTE_SIZE)
memcpy(gdv->pal, pal, AVPALETTE_SIZE);
rescale(gdv, gdv->frame, avctx->width, avctx->height, rescale(gdv, gdv->frame, avctx->width, avctx->height,
!!(flags & 0x10), !!(flags & 0x20)); !!(flags & 0x10), !!(flags & 0x20));
@ -451,7 +454,7 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
ret = decompress_68(avctx, flags >> 8, 1); ret = decompress_68(avctx, flags >> 8, 1);
break; break;
default: default:
return AVERROR_INVALIDDATA; av_assert0(0);
} }
memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE); memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE);