Merge commit '7388c0c58601477db076e2e74e8b11f8a644384a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 09:31:16 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jul 2013 09:31:25 +0000 (11:31 +0200)
* commit '7388c0c58601477db076e2e74e8b11f8a644384a':
  indeo: Properly forward the error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ivi_common.c

index 53a2d2b1f0f79fe006a77bfd06642916a0dc8cd5..0be9baae40726a29abbf81ef97eec547018f3821 100644 (file)
@@ -808,8 +808,16 @@ static int decode_band(IVI45DecContext *ctx,
                 break;
 
             result = ivi_decode_blocks(&ctx->gb, band, tile, avctx);
-            if (result < 0 || ((get_bits_count(&ctx->gb) - pos) >> 3) != tile->data_size) {
-                av_log(avctx, AV_LOG_ERROR, "Corrupted tile data encountered!\n");
+            if (result < 0) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Corrupted tile data encountered!\n");
+                break;
+            }
+
+            if (((get_bits_count(&ctx->gb) - pos) >> 3) != tile->data_size) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Tile data_size mismatch!\n");
+                result = AVERROR_INVALIDDATA;
                 break;
             }