[FFmpeg-cvslog] avcodec/agm: Check output size before allocation
Michael Niedermayer
git at videolan.org
Tue Apr 30 22:55:13 EEST 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Apr 24 17:41:13 2019 +0200| [19af948e53fb8a8d26eb57785420feffd91b619d] | committer: Michael Niedermayer
avcodec/agm: Check output size before allocation
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>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19af948e53fb8a8d26eb57785420feffd91b619d
---
libavcodec/agm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/agm.c b/libavcodec/agm.c
index 332e33897c..a499c09082 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 * 9LL + 10000)
+ return AVERROR_INVALIDDATA;
+
av_fast_padded_malloc(&s->output, &s->padded_output_size, s->output_size);
if (!s->output)
return AVERROR(ENOMEM);
More information about the ffmpeg-cvslog
mailing list