On Sun, Jun 30, 2013 at 06:26:14PM +0200, Luca Barbato wrote: > 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: [email protected] > --- > 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 f7e241b..cdd4376 100644 > --- a/libavcodec/ivi_common.c > +++ b/libavcodec/ivi_common.c > @@ -778,8 +778,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; > } > > --
probably OK _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
