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

avcodec/arbc: Check nb_segments before allocating and copying frame 

Fixes: Timeout (30sec -> 2sec)
Fixes: 13578/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ARBC_fuzzer-5685625527730176

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 2019-03-13 21:48:25 +01:00
parent 8f63fa4c2e
commit 9d20901b92
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/arbc.c
View File

@ -117,6 +117,15 @@ static int decode_frame(AVCodecContext *avctx, void *data,
if (avpkt->size < 10) if (avpkt->size < 10)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
bytestream2_init(&s->gb, avpkt->data, avpkt->size);
bytestream2_skip(&s->gb, 8);
nb_segments = bytestream2_get_le16(&s->gb);
if (nb_segments == 0)
keyframe = 0;
if (7 * nb_segments > bytestream2_get_bytes_left(&s->gb))
return AVERROR_INVALIDDATA;
if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
return ret; return ret;
@ -126,12 +135,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return ret; return ret;
} }
bytestream2_init(&s->gb, avpkt->data, avpkt->size);
bytestream2_skip(&s->gb, 8);
nb_segments = bytestream2_get_le16(&s->gb);
if (nb_segments == 0)
keyframe = 0;
for (int i = 0; i < nb_segments; i++) { for (int i = 0; i < nb_segments; i++) {
int resolution_flag; int resolution_flag;
int fill; int fill;