From 29e9f83192fd366f83a314adfb7892381c2280f5 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 15 Jun 2012 11:46:12 +0000 Subject: j2kdec: check colorspace ncomponents This prevents out of array read. Signed-off-by: Paul B Mahol --- libavcodec/j2kdec.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/j2kdec.c') diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 9c2022e42d..59c2188bb7 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -217,6 +217,10 @@ static int get_siz(J2kDecoderContext *s) s->tile_offset_y = bytestream2_get_be32u(&s->g); // YT0Siz s->ncomponents = bytestream2_get_be16u(&s->g); // CSiz + if(s->ncomponents <= 0 || s->ncomponents > 4) { + av_log(s->avctx, AV_LOG_ERROR, "unsupported/invalid ncomponents: %d\n", s->ncomponents); + return AVERROR(EINVAL); + } if(s->tile_width<=0 || s->tile_height<=0) return AVERROR(EINVAL); -- cgit v1.2.3