From a1e3303fc01b95623d7a6963686c81b076690efd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 8 Nov 2015 13:57:19 +0100 Subject: avutil/softfloat: Fix exponent underflow in av_mul_sf() Signed-off-by: Michael Niedermayer --- libavutil/softfloat.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavutil') diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index fcad0f00cc..e47420e999 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -98,7 +98,10 @@ static inline av_const SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ a.exp += b.exp; av_assert2((int32_t)((a.mant * (int64_t)b.mant) >> ONE_BITS) == (a.mant * (int64_t)b.mant) >> ONE_BITS); a.mant = (a.mant * (int64_t)b.mant) >> ONE_BITS; - return av_normalize1_sf((SoftFloat){a.mant, a.exp - 1}); + a = av_normalize1_sf((SoftFloat){a.mant, a.exp - 1}); + if (!a.mant || a.exp < MIN_EXP) + return FLOAT_0; + return a; } /** -- cgit v1.2.3