d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Do not corrupt internal representation if LINENO inner expansion fails.

Browse Source 
Example:
  f() { : ${LINENO+$((1/0))}; }
and call this function twice.
This commit is contained in:
Jilles Tjoelker 2014-02-27 16:54:43 +00:00
parent e42feeb782
commit 5439648913
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=262565
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/sh/expand.c
View File

@ -672,10 +672,8 @@ evalvar(char *p, int flag)
again: /* jump here after setting a variable with ${var=text} */
if (varflags & VSLINENO) {
set = 1;
special = 0;
val = var;
p[-1] = '\0'; /* temporarily overwrite '=' to have \0
terminated string */
special = 1;
val = NULL;
} else if (special) {
set = varisset(var, varflags & VSNUL);
val = NULL;
@ -704,7 +702,10 @@ evalvar(char *p, int flag)
if (set && subtype != VSPLUS) {
/* insert the value of the variable */
if (special) {
varvalue(var, varflags & VSQUOTE, subtype, flag);
if (varflags & VSLINENO)
STPUTBIN(var, p - var - 1, expdest);
else
varvalue(var, varflags & VSQUOTE, subtype, flag);
if (subtype == VSLENGTH) {
varlenb = expdest - stackblock() - startloc;
varlen = varlenb;
@ -816,7 +817,6 @@ evalvar(char *p, int flag)
default:
abort();
}
p[-1] = '='; /* recover overwritten '=' */
if (subtype != VSNORMAL) { /* skip to end of alternative */
int nesting = 1;

1
bin/sh/tests/builtins/Makefile
View File

@ -87,6 +87,7 @@ FILES+= hash4.0
FILES+= jobid1.0
FILES+= jobid2.0
FILES+= lineno.0 lineno.0.stdout
FILES+= lineno2.0
FILES+= local1.0
FILES+= local2.0
FILES+= local3.0

10
bin/sh/tests/builtins/lineno2.0 Normal file
View File

@ -0,0 +1,10 @@
# $FreeBSD$
f() {
: ${LINENO+${x?}}
}
unset -v x
command eval f 2>/dev/null && exit 3
x=1
f