avcodec/mjpegdec: Check quant_matrixes values for being non zero

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-03-17 03:25:17 +01:00
parent 98da63b3f5
commit 656a17e126

View File

@ -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