From 656a17e126c08ac8ed71da99047f13cf3e6c2a7c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 17 Mar 2017 03:25:17 +0100 Subject: [PATCH] avcodec/mjpegdec: Check quant_matrixes values for being non zero Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 8bf2fdfcc1..af12d5d71b 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -188,6 +188,10 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) /* read quant table */ for (i = 0; i < 64; i++) { s->quant_matrixes[index][i] = get_bits(&s->gb, pr ? 16 : 8); + if (s->quant_matrixes[index][i] == 0) { + av_log(s->avctx, AV_LOG_ERROR, "dqt: 0 quant value\n"); + return AVERROR_INVALIDDATA; + } } // XXX FIXME fine-tune, and perhaps add dc too