diff options
author | Laurent Aimar <fenrir@videolan.org> | 2011-09-13 01:49:36 +0400 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2011-12-24 15:20:33 +0400 |
commit | 117e04cdfa814d2ce4ce46dd925ec5257614d265 (patch) | |
tree | 84937e9bb1cf896b3a331870352da8891ea007ca /libavcodec | |
parent | 5d6fe49ac91b42436616c4f2aad650231646b51a (diff) |
Check for invalid VLC value in smacker decoder.
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 6489455495fc5bfbebcfe3f57e5d4fdd6a781091)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/smacker.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 1af206f10e..0424481f19 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; |