JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes by: millert@cvs.openbsd.org 2004/12/08 14:23:19

Browse Source 
Fix core dumps for ${@:?word} and ${foo[@]?bar}.  With help from
and OK otto@.  Closes PR 4023.
This commit is contained in:
tg 2004-12-08 23:00:14 +00:00
parent f668eac7b1
commit 3de9499c1e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eval.c
View File

@ -1,5 +1,5 @@
/** $MirBSD: eval.c,v 1.7 2004/11/26 15:43:53 tg Exp $ */ /** $MirBSD: eval.c,v 1.8 2004/12/08 23:00:14 tg Exp $ */
/* $OpenBSD: eval.c,v 1.15 2004/11/25 04:36:47 jaredy Exp $ */ /* $OpenBSD: eval.c,v 1.16 2004/12/08 21:23:18 millert Exp $ */
/* /*
* Expansion - quoting, separation, substitution, globbing * Expansion - quoting, separation, substitution, globbing
@ -10,7 +10,7 @@
#include "ksh_dir.h" #include "ksh_dir.h"
#include "ksh_stat.h" #include "ksh_stat.h"
__RCSID("$MirBSD: eval.c,v 1.7 2004/11/26 15:43:53 tg Exp $"); __RCSID("$MirBSD: eval.c,v 1.8 2004/12/08 23:00:14 tg Exp $");
/* /*
* string expansion * string expansion
@ -785,6 +785,7 @@ varsub(Expand *xp, char *sp, char *word, int *stypep, int *slenp)
} }
if (e->loc->argc == 0) { if (e->loc->argc == 0) {
xp->str = null; xp->str = null;
xp->var = global(sp);
state = c == '@' ? XNULLSUB : XSUB; state = c == '@' ? XNULLSUB : XSUB;
} else { } else {
xp->u.strv = (const char **) e->loc->argv + 1; xp->u.strv = (const char **) e->loc->argv + 1;
@ -811,6 +812,7 @@ varsub(Expand *xp, char *sp, char *word, int *stypep, int *slenp)
} }
if (XPsize(wv) == 0) { if (XPsize(wv) == 0) {
xp->str = null; xp->str = null;
xp->var = global(sp);
state = p[1] == '@' ? XNULLSUB : XSUB; state = p[1] == '@' ? XNULLSUB : XSUB;
XPfree(wv); XPfree(wv);
} else { } else {