Module: libav Branch: release/0.6 Commit: 117e04cdfa814d2ce4ce46dd925ec5257614d265
Author: Laurent Aimar <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Mon Sep 12 23:49:36 2011 +0200 Check for invalid VLC value in smacker decoder. Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit 6489455495fc5bfbebcfe3f57e5d4fdd6a781091) Signed-off-by: Anton Khirnov <[email protected]> Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/smacker.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 1af206f..0424481 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -138,6 +138,8 @@ static int smacker_decode_bigtree(GetBitContext *gb, HuffContext *hc, DBCtx *ctx b2 = get_bits_count(gb); i2 = ctx->v2->table ? get_vlc2(gb, ctx->v2->table, SMKTREE_BITS, 3) : 0; b2 = get_bits_count(gb) - b2; + if (i1 < 0 || i2 < 0) + return -1; val = ctx->recode1[i1] | (ctx->recode2[i2] << 8); if(val == ctx->escapes[0]) { ctx->last[0] = hc->current; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
