Browse Source

avcodec/mjpegdec: Check len in ff_mjpeg_decode_dht()

Fixes CID1239167

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.7
Michael Niedermayer 10 years ago
parent
commit
cf9ab119d0
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavcodec/mjpegdec.c

+ 5
- 0
libavcodec/mjpegdec.c View File

@@ -204,6 +204,11 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s)

len = get_bits(&s->gb, 16) - 2;

if (8*len > get_bits_left(&s->gb)) {
av_log(s->avctx, AV_LOG_ERROR, "dht: len %d is too large\n", len);
return AVERROR_INVALIDDATA;
}

while (len > 0) {
if (len < 17)
return AVERROR_INVALIDDATA;


Loading…
Cancel
Save