diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/math.c | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2015-04-15 Peter Stephenson <p.stephenson@samsung.com> + * unposted: Src/math.c: rewrite last commit to look more + like other uses of Nularg. + * 34892 (slightly tweaked): Src/math.c, Test/C01arith.ztst: fix math evaluation with empty expression resulting from substitution. diff --git a/Src/math.c b/Src/math.c index 2105180c8..97a97b32b 100644 --- a/Src/math.c +++ b/Src/math.c @@ -1398,7 +1398,9 @@ matheval(char *s) if (!mlevel) outputradix = outputunderscore = 0; - if (!*s || *s == Nularg) { + if (*s == Nularg) + s++; + if (!*s) { x.type = MN_INTEGER; x.u.l = 0; return x; @@ -1435,7 +1437,9 @@ mathevalarg(char *s, char **ss) * * To avoid a more opaque error further in, bail out here. */ - if (!*s || *s == Nularg) { + if (*s == Nularg) + s++; + if (!*s) { zerr("bad math expression: empty string"); return (zlong)0; } |