diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 21:31:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 00:21:49 +0200 |
| commit | cbc5796fc3f446dbc6da66d22de1ae2f8e9c0527 (patch) | |
| tree | 880d47d9c1831729f59e9b23da97d6ee18597225 | |
| parent | 66b7e165db8a26b67558d1861c22a4f1f8fdb113 (diff) | |
| download | ffmpeg-cbc5796fc3f446dbc6da66d22de1ae2f8e9c0527.tar.gz | |
avutil/softfloat: Fix overflow in av_div_sf()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 277e397eb5964999bd76909f52d4bd3350289c22)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavutil/softfloat.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index fed3e77f87..daf91a5557 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -114,8 +114,15 @@ static inline av_const SoftFloat av_mul_sf(SoftFloat a, SoftFloat b){ * @return Will not be more denormalized than a. */ static inline av_const SoftFloat av_div_sf(SoftFloat a, SoftFloat b){ + int64_t temp = (int64_t)a.mant * (1<<(ONE_BITS+1)); + temp /= b.mant; a.exp -= b.exp; - a.mant = ((int64_t)a.mant<<(ONE_BITS+1)) / b.mant; + a.mant = temp; + while (a.mant != temp) { + temp /= 2; + a.exp--; + a.mant = temp; + } a = av_normalize1_sf(a); if (!a.mant || a.exp < MIN_EXP) return FLOAT_0; |