]> git.sesse.net Git - ffmpeg/commitdiff
avutil/eval: Unconditionally check argument of e_div
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 20 Oct 2020 18:33:50 +0000 (20:33 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 11 Jan 2021 22:21:05 +0000 (23:21 +0100)
Fixes: division by zero
Fixes: 26451/clusterfuzz-testcase-minimized-ffmpeg_dem_VIVO_fuzzer-4756955832516608
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 d527f6a9d041f9678944f92b7d4c3688b5dc3754..aaa8eb4945a312f886344f72f814974e1e2a1fa4 100644 (file)
@@ -317,7 +317,7 @@ static double eval_expr(Parser *p, AVExpr *e)
                 case e_lte: return e->value * (d <= d2 ? 1.0 : 0.0);
                 case e_pow: return e->value * pow(d, d2);
                 case e_mul: return e->value * (d * d2);
-                case e_div: return e->value * ((!CONFIG_FTRAPV || d2 ) ? (d / d2) : d * INFINITY);
+                case e_div: return e->value * (d2 ? (d / d2) : d * INFINITY);
                 case e_add: return e->value * (d + d2);
                 case e_last:return e->value * d2;
                 case e_st : return e->value * (p->var[av_clip(d, 0, VARS-1)]= d2);