[FFmpeg-cvslog] r24656 - trunk/libavcodec/vp8.c

[skal]

Author: skal
Date: Mon Aug  2 01:20:06 2010
New Revision: 24656

Log:
prevent access to vp8_coeff_band[16]

Modified:
   trunk/libavcodec/vp8.c

Modified: trunk/libavcodec/vp8.c
==============================================================================
--- trunk/libavcodec/vp8.c	Mon Aug  2 01:04:16 2010	(r24655)
+++ trunk/libavcodec/vp8.c	Mon Aug  2 01:20:06 2010	(r24656)
@@ -822,11 +822,11 @@ static int decode_block_coeffs(VP56Range
 
 skip_eob:
         if (!vp56_rac_get_prob_branchy(c, token_prob[1])) { // DCT_0
+            if (++i == 16)
+                return nonzero; // invalid input; blocks should end with EOB
             zero_nhood = 0;
-            token_prob = probs[vp8_coeff_band[++i]][0];
-            if (i < 16)
-                goto skip_eob;
-            return nonzero; // invalid input; blocks should end with EOB
+            token_prob = probs[vp8_coeff_band[i]][0];
+            goto skip_eob;
         }
 
         if (!vp56_rac_get_prob_branchy(c, token_prob[2])) { // DCT_1