summaryrefslogtreecommitdiff
path: root/libavutil/softfloat.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-06 21:31:49 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-06 23:23:39 +0200
commit277e397eb5964999bd76909f52d4bd3350289c22 (patch)
tree5ad8e96c9d3a9a40d6ec298a8e1c707eb13bf0f7 /libavutil/softfloat.h
parentb9d2005ea5d6837917a69bc2b8e98f5695f54e39 (diff)
downloadffmpeg-277e397eb5964999bd76909f52d4bd3350289c22.tar.gz
avutil/softfloat: Fix overflow in av_div_sf()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil/softfloat.h')
-rw-r--r--libavutil/softfloat.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index 5d376e438a..32b33d9dfd 100644
--- a/libavutil/softfloat.h
+++ b/libavutil/softfloat.h
@@ -113,8 +113,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;