From ac3b01a9c0607961f4540fe62040833870f5deb1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 19 Aug 2013 03:33:40 +0200 Subject: avcodec/jpeg2000dec: check transform equality in MCT Fixes null pointer dereference Fixes Ticket2843 Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavcodec') diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index aae369787f..cbba2d02d8 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1140,6 +1140,12 @@ static void mct_decode(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile) int32_t *src[3], i0, i1, i2; float *srcf[3], i0f, i1f, i2f; + for (i = 1; i < 3; i++) + if (tile->codsty[0].transform != tile->codsty[i].transform) { + av_log(s->avctx, AV_LOG_ERROR, "Transforms mismatch, MCT not supported\n"); + return; + } + for (i = 0; i < 3; i++) if (tile->codsty[0].transform == FF_DWT97) srcf[i] = tile->comp[i].f_data; -- cgit v1.2.3