summaryrefslogtreecommitdiffstats
path: root/bin/sh/nodes.c.pat
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/nodes.c.pat
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/nodes.c.pat')
-rw-r--r--bin/sh/nodes.c.pat13
1 files changed, 12 insertions, 1 deletions
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index b6a8559..1f5adbb 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -61,6 +61,10 @@ STATIC struct nodelist *copynodelist(struct nodelist *);
STATIC char *nodesavestr(char *);
+struct funcdef {
+ unsigned int refcount;
+ union node n;
+};
/*
* Make a copy of a parse tree.
@@ -85,6 +89,12 @@ copyfunc(union node *n)
}
+union node *
+getfuncnode(struct funcdef *fn)
+{
+ return fn == NULL ? NULL : &fn->n;
+}
+
STATIC void
calcsize(union node *n)
@@ -153,7 +163,8 @@ nodesavestr(char *s)
void
reffunc(struct funcdef *fn)
{
- fn->refcount++;
+ if (fn)
+ fn->refcount++;
}
OpenPOWER on IntegriCloud