diff options
author | Jilles Tjoelker <jilles@FreeBSD.org> | 2009-08-28 22:41:25 +0000 |
---|---|---|
committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2009-08-28 22:41:25 +0000 |
commit | e16947f83d758544093c5709d58be72bd4d25522 (patch) | |
tree | 7a8084b831c46519ff07655affc5c604f115d66a /bin/sh/nodes.c.pat | |
parent | a99fcfd4ca91f6fc8cd17f665933648559172adf (diff) | |
download | src-e16947f83d758544093c5709d58be72bd4d25522.tar.gz src-e16947f83d758544093c5709d58be72bd4d25522.zip |
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
Notes
Notes:
svn path=/head/; revision=196634
Diffstat (limited to 'bin/sh/nodes.c.pat')
-rw-r--r-- | bin/sh/nodes.c.pat | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat index b6a855977d7d..1f5adbbae4ae 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++; } |