From 51a23b0e95ac117a691c7d849c7af7ffa9e7d18b Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sun, 30 Jun 2013 09:57:56 +0200 Subject: [PATCH] indeo: Properly forward the error codes If the tile data size does not match the buffer size it did not return an AVERROR_INVALIDDATA causing futher corruption later. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 7388c0c58601477db076e2e74e8b11f8a644384a) Signed-off-by: Reinhard Tartler --- libavcodec/ivi_common.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 3bdcbaba56..f0e4f60ff1 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -774,8 +774,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; }