aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-04 20:48:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-04 21:27:25 +0100
commita6ba4c1116c16c01a2faf188d47c9ed7bb727a06 (patch)
tree22cd3c0072d546d8232d783c6753abab6e3d49eb
parentaf0544ca3d40d1277dec1175a1939a74c5b12ce4 (diff)
downloadffmpeg-a6ba4c1116c16c01a2faf188d47c9ed7bb727a06.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
-rw-r--r--libavcodec/mjpegdec.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 748107d1fb..f12210a5a1 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -471,9 +471,12 @@ unk_pixfmt:
}
if (s->ls) {
s->upscale_h = s->upscale_v = 0;
- if (s->nb_components > 1)
+ if (s->nb_components == 3) {
s->avctx->pix_fmt = AV_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 = AV_PIX_FMT_GRAY8;
else
s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;