diff mbox

[FFmpeg-devel,1/2] avcodec/mjpegdec: Check quant_matrixes values for being non zero

Message ID 20170317022518.19875-1-michael@niedermayer.cc
State Accepted
Commit 656a17e126c08ac8ed71da99047f13cf3e6c2a7c
Headers show

Commit Message

Michael Niedermayer March 17, 2017, 2:25 a.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/mjpegdec.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer March 20, 2017, 12:38 a.m. UTC | #1 
On Fri, Mar 17, 2017 at 03:25:17AM +0100, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mjpegdec.c | 4 ++++
>  1 file changed, 4 insertions(+)

patchset applied

[...]
diff mbox

Patch

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 4e78e1e3ae..b159cac197 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