diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-17 03:25:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-20 01:38:02 +0100 |
| commit | 656a17e126c08ac8ed71da99047f13cf3e6c2a7c (patch) | |
| tree | 8448ba11e6098d49e5f5de4a94950e0b11ea14cb /libavcodec/mjpegdec.c | |
| parent | 98da63b3f5f5a277c5c3a16860db9a9f6741e54c (diff) | |
| download | ffmpeg-656a17e126c08ac8ed71da99047f13cf3e6c2a7c.tar.gz | |
avcodec/mjpegdec: Check quant_matrixes values for being non zero
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 |