diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-03 02:12:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-04 11:31:17 +0200 |
| commit | 8e3b01e20ebd82528c3302d6756f3c6dffa4bfb2 (patch) | |
| tree | 1ebab3f8757c463d628018f31484705d6d503e40 /libavcodec/agm.c | |
| parent | ee16d14b0a29317f6118a209c4d0737b97b7f58f (diff) | |
| download | ffmpeg-8e3b01e20ebd82528c3302d6756f3c6dffa4bfb2.tar.gz | |
avcodec/agm: More completely check size before using it
Fixes: out of array access
Fixes: 13997/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5701427252428800
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>
Diffstat (limited to 'libavcodec/agm.c')
| -rw-r--r-- | libavcodec/agm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/agm.c b/libavcodec/agm.c index b0e8b80f81..2d2092222d 100644 --- a/libavcodec/agm.c +++ b/libavcodec/agm.c @@ -562,7 +562,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, for (int i = 0; i < 3; i++) s->size[i] = bytestream2_get_le32(gbyte); - if (32LL + s->size[0] + s->size[1] + s->size[2] > avpkt->size) + if (s->size[0] < 0 || s->size[1] < 0 || s->size[2] < 0 || + 32LL + s->size[0] + s->size[1] + s->size[2] > avpkt->size) return AVERROR_INVALIDDATA; if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) |