On Thu, Mar 29, 2012 at 11:52:21AM -0700, Ronald S. Bultje wrote: > From: Michael Niedermayer <[email protected]> > > Fixes a floating-point exception further down. > > Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > CC: [email protected] > Signed-off-by: Ronald S. Bultje <[email protected]> > --- > libavcodec/apedec.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c > index a9953e1..1f98267 100644 > --- a/libavcodec/apedec.c > +++ b/libavcodec/apedec.c > @@ -421,9 +421,12 @@ static inline int ape_decode_value(APEContext *ctx, > APERice *rice) > > if (tmpk <= 16) > x = range_decode_bits(ctx, tmpk); > - else { > + else if (tmpk <= 32) { > x = range_decode_bits(ctx, 16); > x |= (range_decode_bits(ctx, tmpk - 16) << 16); > + } else { > + av_log(ctx->avctx, AV_LOG_ERROR, "Too many bits: %d\n", tmpk); > + return AVERROR_INVALIDDATA; > } > x += overflow << tmpk; > } else { > --
looks OK _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
