diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-04 20:48:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 00:47:05 +0100 |
| commit | 75b0cfcf105c8720a47a2ee80a70ba16799d71b7 (patch) | |
| tree | a3ab4fc71d6a4d79033b0b97c1dbbfabd6df0515 /libavcodec/mjpegdec.c | |
| parent | c68fe8ac8b9d0602e24e1c8c5d575fb21a8b3364 (diff) | |
| download | ffmpeg-75b0cfcf105c8720a47a2ee80a70ba16799d71b7.tar.gz | |
avcodec/mjpegdec: Check number of components for JPEG-LS
Fixes out of array accesses
Fixes: asan_heap-oob_1c1a4ea_1242_cov_2274415971_TESTcmyk.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fabbfaa095660982cc0bc63242c459561fa37037)
Conflicts:
libavcodec/mjpegdec.c
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 8a6d50de0f..a0dcbc76e5 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -347,9 +347,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) return -1; } if(s->ls){ - if(s->nb_components > 1) + if(s->nb_components == 3) { s->avctx->pix_fmt = PIX_FMT_RGB24; - else if(s->bits <= 8) + } else if (s->nb_components != 1) { + av_log(s->avctx, AV_LOG_ERROR, "Unsupported number of components %d\n", s->nb_components); + return AVERROR_PATCHWELCOME; + } else if (s->bits <= 8) s->avctx->pix_fmt = PIX_FMT_GRAY8; else s->avctx->pix_fmt = PIX_FMT_GRAY16; |