diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-31 16:22:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:20 +0200 |
| commit | 4fd805a2ae03dfed4bbec14bffa645779b874758 (patch) | |
| tree | 7766e5a8835a2ccb6dae0ed09a2237d88ba21e24 | |
| parent | 439d8ae6848ae0f81f5bccd7908c0bfe8de1e71f (diff) | |
| download | ffmpeg-4fd805a2ae03dfed4bbec14bffa645779b874758.tar.gz | |
libavutil/eval: Remove CONFIG_TRAPV special handling
Fixes: division by zero
Fixes: 29555/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVO_fuzzer-5149951447400448
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8574fcbfc7784173347418e09035ff8121574571)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavutil/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/eval.c b/libavutil/eval.c index d291c5d6d5..720cf744b1 100644 --- a/libavutil/eval.c +++ b/libavutil/eval.c @@ -289,7 +289,7 @@ static double eval_expr(Parser *p, AVExpr *e) double d = eval_expr(p, e->param[0]); double d2 = eval_expr(p, e->param[1]); switch (e->type) { - case e_mod: return e->value * (d - floor((!CONFIG_FTRAPV || d2) ? d / d2 : d * INFINITY) * d2); + case e_mod: return e->value * (d - floor(d2 ? d / d2 : d * INFINITY) * d2); case e_gcd: return e->value * av_gcd(d,d2); case e_max: return e->value * (d > d2 ? d : d2); case e_min: return e->value * (d < d2 ? d : d2); |