On Tue, Apr 16, 2013 at 03:19:35PM +0200, Anton Khirnov wrote: > The data offsets are relative to the bistream header, which is 16 bytes > after the start of the data. > Fixes invalid reads with corrupted files. > > Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > CC:[email protected] > --- > libavcodec/indeo3.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c > index 5c52edd..af41552 100644 > --- a/libavcodec/indeo3.c > +++ b/libavcodec/indeo3.c > @@ -893,8 +893,7 @@ static int decode_frame_headers(Indeo3DecodeContext *ctx, > AVCodecContext *avctx, > > if (ctx->data_size == 16) > return 4; > - if (ctx->data_size > buf_size) > - ctx->data_size = buf_size; > + ctx->data_size = FFMIN(ctx->data_size, buf_size - 16); > > bytestream2_skip(&gb, 3); // skip reserved byte and checksum > > --
probably OK _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
