aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-09 17:39:38 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-14 16:51:01 +0100
commit8be41ad2bb3201aac6ec608e860ecb3e4ff02c26 (patch)
treed707b3f84e4a0baea82464aa589e906de46b5c08
parent9a8d2f51cf0548aa3724e2a46e58416b333c755f (diff)
downloadffmpeg-8be41ad2bb3201aac6ec608e860ecb3e4ff02c26.tar.gz
avutil/mathematics: Fix division by 0
Fixes: CID1341571 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bc8b1e694cc395fdf5e2917377ef11263c937d85) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavutil/mathematics.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index 4d8467b8c8..78a87d8457 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -90,7 +90,7 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd)
else {
int64_t ad = a / c;
int64_t a2 = (a % c * b + r) / c;
- if (ad >= INT32_MAX && ad > (INT64_MAX - a2) / b)
+ if (ad >= INT32_MAX && b && ad > (INT64_MAX - a2) / b)
return INT64_MIN;
return ad * b + a2;
}