]> git.sesse.net Git - ffmpeg/commitdiff
libavutil/eval: Remove CONFIG_TRAPV special handling
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 31 Jan 2021 15:22:53 +0000 (16:22 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 10 Feb 2021 11:28:29 +0000 (12:28 +0100)
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>
libavutil/eval.c

index aaa8eb4945a312f886344f72f814974e1e2a1fa4..d0bada9b3181e07ba746d35693b8722f11743fef 100644 (file)
@@ -306,7 +306,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);