[FFmpeg-devel] [PATCH 1/2] avcodec/agm: Check output size before allocation
Michael Niedermayer
michael at niedermayer.cc
Wed Apr 24 23:35:09 EEST 2019
Fixes: OOM
Fixes: 14198/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AGM_fuzzer-5723579234123776
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
libavcodec/agm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/agm.c b/libavcodec/agm.c
index 332e33897c..f7cf8513d0 100644
--- a/libavcodec/agm.c
+++ b/libavcodec/agm.c
@@ -1049,6 +1049,9 @@ static int decode_huffman2(AVCodecContext *avctx, int header, int size)
s->output_size = get_bits_long(gb, 32);
+ if (s->output_size > avctx->width * avctx->height * 9L + 10000)
+ return AVERROR_INVALIDDATA;
+
av_fast_padded_malloc(&s->output, &s->padded_output_size, s->output_size);
if (!s->output)
return AVERROR(ENOMEM);
--
2.21.0
More information about the ffmpeg-devel
mailing list