external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Properly block .sh.level and .sh.value discipline functions

Browse source 
These now give an "invalid discipline function" error instead of
being silently ignored or crashing the shell.
This commit is contained in:
Martijn Dekker 2022-07-16 05:20:13 +02:00
parent 42fc5c4c0d
commit 6c71c5ec4f
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/ksh93/sh/nvdisc.c
View file

@ -507,6 +507,8 @@ char *nv_setdisc(register Namval_t* np,register const char *event,Namval_t *acti
if (type < 0) if (type < 0)
return(NIL(char*)); return(NIL(char*));
/* Handle GET/SET/APPEND/UNSET disc */ /* Handle GET/SET/APPEND/UNSET disc */
if(np==SH_VALNOD || np==SH_LEVELNOD)
return(0);
if(vp && vp->fun.disc->putval!=assign) if(vp && vp->fun.disc->putval!=assign)
vp = 0; vp = 0;
if(!vp) if(!vp)
@ -529,7 +531,7 @@ char *nv_setdisc(register Namval_t* np,register const char *event,Namval_t *acti
action = vp->disc[type]; action = vp->disc[type];
empty = 0; empty = 0;
} }
else if(action && np!=SH_LEVELNOD) else if(action)
{ {
Namdisc_t *dp = (Namdisc_t*)vp->fun.disc; Namdisc_t *dp = (Namdisc_t*)vp->fun.disc;
dp->getval = lookup; dp->getval = lookup;

14
src/cmd/ksh93/tests/variables.sh
View file

@ -1401,5 +1401,19 @@ exp=$'0\n1\n1'
[[ $got == "$exp" ]] || err_exit '${.sh.level} in dot script not correct' \ [[ $got == "$exp" ]] || err_exit '${.sh.level} in dot script not correct' \
"(expected $(printf %q "$exp"), got $(printf %q "$got"))" "(expected $(printf %q "$exp"), got $(printf %q "$got"))"
# ======
# setting a .sh.value or .sh.level discipline makes no sense, but should be an error, not crash the shell
for v in .sh.value .sh.level
do
for d in get set append
do
exp=": $v.$d: invalid discipline function"
got=$(set +x; { "$SHELL" -c "$v.$d() { .sh.value=foo; }; $v=13; $v+=13; : \${$v}"; } 2>&1)
(((e = $?)==1)) && [[ $got == *"$exp" ]] || err_exit "attempt to set $v.get discipline does not fail gracefully" \
"(expected status 1 and match of *$(printf %q "$exp")," \
"got status $e$( ((e>128)) && print -n /SIG && kill -l "$e") and $(printf %q "$got"))"
done
done
# ====== # ======
exit $((Errors<125?Errors:125)) exit $((Errors<125?Errors:125))