GitList

Browse code

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 <siretart@tauware.de>

Conflicts:
libavcodec/ivi_common.c

Luca Barbato authored on 2013/06/30 16:57:56
Showing 1 changed files

libavcodec/ivi_common.c

History View file @ 7658333

@@ -737,8 +737,16 @@ static int decode_band(IVI45DecContext *ctx, int plane_num,
                                      break;
                                  result = ff_ivi_decode_blocks(&ctx->gb, band, tile);
                     -            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;
+                                 }