Module: libav Branch: release/0.8 Commit: e8050f313e7e3e1893155f878475872c4cc3a6e7
Author: Michael Niedermayer <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Thu Mar 29 17:52:21 2012 +0000 apedec: check bits <= 32. Fixes a floating-point exception further down. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] Signed-off-by: Michael Niedermayer <[email protected]> Signed-off-by: Ronald S. Bultje <[email protected]> Signed-off-by: Derek Buitenhuis <[email protected]> (cherry picked from commit 420d1df2e2a857eae45fa947e16eae7494793d57) Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/apedec.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index fa50d61..0abf05b 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -404,9 +404,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 { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
