From 0679cec6e8802643bbe6d5f68ca1110a7d3171da Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Wed, 11 Sep 2013 15:54:20 +0300 Subject: smacker: Make sure we don't fill in huffman codes out of range MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö --- libavcodec/smacker.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavcodec/smacker.c') diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index d33c223dcf..9819fa58cc 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -268,6 +268,12 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int if(ctx.last[0] == -1) ctx.last[0] = huff.current++; if(ctx.last[1] == -1) ctx.last[1] = huff.current++; if(ctx.last[2] == -1) ctx.last[2] = huff.current++; + if (ctx.last[0] >= huff.length || + ctx.last[1] >= huff.length || + ctx.last[2] >= huff.length) { + av_log(smk->avctx, AV_LOG_ERROR, "Huffman codes out of range\n"); + err = AVERROR_INVALIDDATA; + } *recodes = huff.values; -- cgit v1.2.3