summaryrefslogtreecommitdiffstats
path: root/bin/sh/eval.c
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2009-08-28 22:41:25 +0000
committerjilles <jilles@FreeBSD.org>2009-08-28 22:41:25 +0000
commit0bf6e8da4eba6a1fb35ec2e5b2db62e53fec7d32 (patch)
tree7a8084b831c46519ff07655affc5c604f115d66a /bin/sh/eval.c
parent9940277b0b89316256a4ba3df75a0b17de8b7157 (diff)
downloadFreeBSD-src-0bf6e8da4eba6a1fb35ec2e5b2db62e53fec7d32.zip
FreeBSD-src-0bf6e8da4eba6a1fb35ec2e5b2db62e53fec7d32.tar.gz
sh: Fix crash with empty functions (f() { }) introduced in r196483
Empty pairs of braces are represented by a NULL node pointer, just like empty lines at the top level. Support for empty pairs of braces may be removed later. They make the code more complex, have inconsistent behaviour (may or may not change $?), are not specified by POSIX and are not allowed by some other shells like bash, dash and ksh93. Reported by: kan
Diffstat (limited to 'bin/sh/eval.c')
-rw-r--r--bin/sh/eval.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 8dfa7dd..7978b84 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -807,9 +807,9 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
funcnest++;
exitstatus = oexitstatus;
if (flags & EV_TESTED)
- evaltree(&cmdentry.u.func->n, EV_TESTED);
+ evaltree(getfuncnode(cmdentry.u.func), EV_TESTED);
else
- evaltree(&cmdentry.u.func->n, 0);
+ evaltree(getfuncnode(cmdentry.u.func), 0);
funcnest--;
INTOFF;
unreffunc(cmdentry.u.func);
OpenPOWER on IntegriCloud