ffmpeg | branch: release/1.2 | Michael Niedermayer <michae...@gmx.at> | Wed Feb
4 20:48:30 2015 +0100| [fd6a9fcd427b86c0a249a8cdb33f746f33706725] | committer:
Michael Niedermayer
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 <michae...@gmx.at>
(cherry picked from commit fabbfaa095660982cc0bc63242c459561fa37037)
Conflicts:
libavcodec/mjpegdec.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd6a9fcd427b86c0a249a8cdb33f746f33706725
---
libavcodec/mjpegdec.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index f04b603..fe1e5da 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -437,9 +437,12 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
}
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;
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
