[FFmpeg-cvslog] Check for invalid VLC value in smacker decoder.

Laurent Aimar git at videolan.org
Thu Sep 22 01:17:29 CEST 2011


ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Mon Sep 12 23:49:36 2011 +0200| [a5107aab98bf67ba32eb8b6a3a7478e620b7d3b3] | committer: Anton Khirnov

Check for invalid VLC value in smacker decoder.

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 6489455495fc5bfbebcfe3f57e5d4fdd6a781091)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5107aab98bf67ba32eb8b6a3a7478e620b7d3b3
---

 libavcodec/smacker.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index e8de0d8..9628b07 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -139,6 +139,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;



More information about the ffmpeg-cvslog mailing list