From 286beebdc34d11a301dfa5189e84f1c399d56133 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 2 Oct 2013 01:16:11 +0200 Subject: avcodec/wmalosslessdec: check block_align Code copied from wmaprodec Fixes null pointer dereference Fixes Ticket3002 Signed-off-by: Michael Niedermayer --- libavcodec/wmalosslessdec.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavcodec/wmalosslessdec.c') diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index df44855e53..ab764ed8d8 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -178,6 +178,11 @@ static av_cold int decode_init(AVCodecContext *avctx) unsigned int channel_mask; int i, log2_max_num_subframes; + if (!avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + return AVERROR(EINVAL); + } + s->avctx = avctx; init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); -- cgit v1.2.3