diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-12 23:49:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-03 03:27:53 +0100 |
| commit | f936799f0b72799000cd842922a05005f70cb553 (patch) | |
| tree | f422d64820b5a1cdff16b5e761b79fa1d72dcae7 | |
| parent | f6d3dfe78b431a5c17c3a102c338aa0b2d095ac3 (diff) | |
| download | ffmpeg-f936799f0b72799000cd842922a05005f70cb553.tar.gz | |
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>
| -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 8cef6423c1..716b63fc6f 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; |