diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-05 00:36:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-05 01:39:20 +0200 |
| commit | 61c68000eda643dfce96dc46b488d39fd5c4e309 (patch) | |
| tree | a9ca2f1b66660b2bd57001fa61c1664f423edc8e /libavcodec/mjpegdec.c | |
| parent | f9742896713d220a006a7423a481129aeedc14fc (diff) | |
| download | ffmpeg-61c68000eda643dfce96dc46b488d39fd5c4e309.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c89bfdb443..2d609c4232 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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, |