]> git.sesse.net Git - ffmpeg/commitdiff
10l, check 'i' validity before using it
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Mon, 8 Oct 2007 12:11:19 +0000 (12:11 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Mon, 8 Oct 2007 12:11:19 +0000 (12:11 +0000)
Originally committed as revision 10684 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/dnxhddec.c

index 3452d49629904641aa1d4aa5c5d4f2217a9e958b..8ea40d1e35e7c41b74437f48b102b5acb4973956 100644 (file)
@@ -189,6 +189,11 @@ static void dnxhd_decode_dct_block(DNXHDContext *ctx, DCTELEM *block, int n, int
             i += ctx->cid_table->run[index2];
         }
 
+        if (i > 63) {
+            av_log(ctx->avctx, AV_LOG_ERROR, "ac tex damaged %d, %d\n", n, i);
+            return;
+        }
+
         j = ctx->scantable.permutated[i];
         //av_log(ctx->avctx, AV_LOG_DEBUG, "j %d\n", j);
         //av_log(ctx->avctx, AV_LOG_DEBUG, "level %d, weigth %d\n", level, weigth_matrix[i]);
@@ -197,12 +202,6 @@ static void dnxhd_decode_dct_block(DNXHDContext *ctx, DCTELEM *block, int n, int
             level += 32;
         level >>= 6;
         level = (level^sign) - sign;
-
-        if (i > 63) {
-            av_log(ctx->avctx, AV_LOG_ERROR, "ac tex damaged %d, %d\n", n, i);
-            return;
-        }
-
         //av_log(NULL, AV_LOG_DEBUG, "i %d, j %d, end level %d\n", i, j, level);
         block[j] = level;
     }