From 90ebf3c428352eb1d4116bf97b470ceca295d7d6 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Tue, 15 Nov 2016 22:11:05 +0100 Subject: dds: limit 4 bpp handling to AV_PIX_FMT_PAL8 This fixes NULL pointer dereferencing for formats, where frame->data[1] is not allocated. The problem was introduced in commit 257fbc3af4cba08ac471dab68924182160bde6fd. Reviewed-by: Paul B Mahol Signed-off-by: Andreas Cadhalpun --- libavcodec/dds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/dds.c') diff --git a/libavcodec/dds.c b/libavcodec/dds.c index 43319a8441..fa0f34d7e7 100644 --- a/libavcodec/dds.c +++ b/libavcodec/dds.c @@ -680,7 +680,7 @@ static int dds_decode(AVCodecContext *avctx, void *data, /* Use the decompress function on the texture, one block per thread. */ ctx->tex_data = gbc->buffer; avctx->execute2(avctx, decompress_texture_thread, frame, NULL, ctx->slice_count); - } else if (!ctx->paletted && ctx->bpp == 4) { + } else if (!ctx->paletted && ctx->bpp == 4 && avctx->pix_fmt == AV_PIX_FMT_PAL8) { uint8_t *dst = frame->data[0]; int x, y, i; -- cgit v1.2.3