external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 11:42:21 +00:00
Code Issues Releases Wiki Activity

Fix two problems with 'unset -f' behavior (#22)

Browse source 
src/cmd/ksh93/sh/name.c:
 - Correct the check for when a function is currently running
   to fix a segmentation fault that occurred when a POSIX
   function tries to unset itself while it is running.
   This bug fix was backported from ksh93v-.

src/cmd/ksh93/sh/xec.c:
 - If a function tries to unset itself, unset the function
   with '_nv_unset(np, NV_RDONLY)' to fix a silent failure.
   This fix was also backported from ksh93v-.

src/cmd/ksh93/tests/functions.sh:
 - Add four regression tests for when a function unsets itself.

Resolves #21
This commit is contained in:
Johnothan King 2020-06-17 10:26:43 -07:00 committed by GitHub
parent 746ce73671
commit b7932e87b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
NEWS
View file

@ -3,6 +3,15 @@ For full details, see the git log at: https://github.com/ksh93/ksh
Any uppercase BUG_* names are modernish shell bug IDs.
2020-06-17:
- A POSIX function that unsets itself while it is running no longer causes
a segmentation fault.
- `unset -f` no longer silently fails when a KornShell style function tries
to unset itself while it is running. The function will now be unset once
it has finished running.
2020-06-16:
- Passing the '-d' flag to the read builtin will no longer cause the '-r'

2
src/cmd/ksh93/include/version.h
View file

@ -17,4 +17,4 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#define SH_RELEASE "93u+m 2020-06-16"
#define SH_RELEASE "93u+m 2020-06-17"

2
src/cmd/ksh93/sh/name.c
View file

@ -2509,7 +2509,7 @@ void _nv_unset(register Namval_t *np,int flags)
if(is_afunction(np) && np->nvalue.ip)
{
register struct slnod *slp = (struct slnod*)(np->nvenv);
if(shp->st.real_fun == np->nvalue.rp)
if(np->nvalue.rp->running)
{
np->nvalue.rp->running |= 1;
return;

5
src/cmd/ksh93/sh/xec.c
View file

@ -3505,6 +3505,11 @@ static void sh_funct(Shell_t *shp,Namval_t *np,int argn, char *argv[],struct arg
nv_putval(SH_PATHNAMENOD,shp->st.filename,NV_NOFREE);
shp->pipepid = pipepid;
np->nvalue.rp->running -= 2;
if(np->nvalue.rp && np->nvalue.rp->running==1)
{
np->nvalue.rp->running = 0;
_nv_unset(np, NV_RDONLY);
}
}
/*

9
src/cmd/ksh93/tests/functions.sh
View file

@ -1249,5 +1249,14 @@ expect_status=0
[[ $actual == "$expect" ]] ||
err_exit "autoload function skipped dir test wrong output (expected $(printf %q "$expect"), got $(printf %q "$actual"))"
# ======
# When a function unsets itself, it should not fail to be unset
$SHELL -c 'PATH=/dev/null; fn() { unset -f fn; true; }; fn' || err_exit 'unset of POSIX function in the calling stack fails'
$SHELL -c 'PATH=/dev/null; function ftest { ftest2; }; function ftest2 { unset -f ftest; }; ftest' || err_exit 'unset of ksh function in the calling stack fails'
$SHELL -c 'PATH=/dev/null; fn() { unset -f fn; true; }; fn; fn' 2> /dev/null
[[ $? != 127 ]] && err_exit 'unset of POSIX function fails when it is still running'
$SHELL -c 'PATH=/dev/null; function fn { unset -f fn; true; }; fn; fn' 2> /dev/null
[[ $? != 127 ]] && err_exit 'unset of ksh function fails when it is still running'
# ======
exit $((Errors<125?Errors:125))