Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: Don't crash when math recursion limit is exceeded



This used to never trigger for me when compiling in debug mode, but I
finally had better luck today and tracked it down.

*ep seems to already be NULL, but I couldn't quite figure out where it
was set to NULL so I figured it can't hurt to make it explicitly NULL
at that point. I suppose setting *ep = ""; would also work (without the
second hunk)?

---
 Src/math.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Src/math.c b/Src/math.c
index f8a4eef..43cede9 100644
--- a/Src/math.c
+++ b/Src/math.c
@@ -362,6 +362,7 @@ mathevall(char *s, enum prec_type prec_tp, char **ep)
     if (mlevel >= MAX_MLEVEL) {
 	xyyval.type = MN_INTEGER;
 	xyyval.u.l = 0;
+	*ep = NULL;
 
 	zerr("math recursion limit exceeded");
 
@@ -1352,7 +1353,7 @@ matheval(char *s)
     }
     x = mathevall(s, MPREC_TOP, &junk);
     mtok = xmtok;
-    if (*junk)
+    if (junk && *junk)
 	zerr("bad math expression: illegal character: %c", *junk);
     return x;
 }
-- 
1.7.10.GIT



Messages sorted by: Reverse Date, Date, Thread, Author