Browse Source

avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()

These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.

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

+ 6
- 0
libavcodec/mjpegdec.c View File

@@ -794,6 +794,12 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p
int resync_mb_y = 0;
int resync_mb_x = 0;

if (s->nb_components != 3 && s->nb_components != 4)
return AVERROR_INVALIDDATA;
if (s->v_max != 1 || s->h_max != 1 || !s->lossless)
return AVERROR_INVALIDDATA;


s->restart_count = s->restart_interval;

av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size,


Loading…
Cancel
Save