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

Error on defining disc for undeclared type member (re: 87088361)

Browse source 
$ typeset -T _bad_disc_t=(typeset dummy; function foo.get { :; })
  Abort

One of the abort() calls that replaced a debug message in the
referenced commit was triggered when trying to define a discipline
function for a nonexistent type member inside a 'typeset -T' type
definition.

src/cmd/ksh93/sh/nvtype.c: std_disc():
- Issue a proper error message for that condition.
This commit is contained in:
Martijn Dekker 2022-06-08 00:39:27 +01:00
parent 2a43cbc3f6
commit 7b8e7fbb49
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cmd/ksh93/sh/nvtype.c
View file

@ -757,7 +757,12 @@ found:
}
}
nv_onattr(mp,NV_NOFREE);
if(!np || !nv_setdisc(np, cp, mp, (Namfun_t*)np))
if(!np)
{
errormsg(SH_DICT,ERROR_exit(1),"%s: cannot set discipline for undeclared type member",sp);
UNREACHABLE();
}
if(!nv_setdisc(np, cp, mp, (Namfun_t*)np))
abort();
return(1);
}

7
src/cmd/ksh93/tests/types.sh
View file

@ -771,5 +771,12 @@ namespace sh.type
[[ $got == "$exp" ]] || err_exit "'tyeset -p .sh.type' failed" \
"(expected $(printf %q "$exp"), got $(printf %q "$got"))"
# ======
# Check for correct error message when attempting to set a discipline function for a nonexistent type member
exp=": foo.get: cannot set discipline for undeclared type member"
got=$(set +x; redirect 2>&1; typeset -T _bad_disc_t=(typeset dummy; function foo.get { :; }); echo end_reached)
let "(e=$?)==1" && [[ $got == *"$exp" ]] || err_exit "attempt to set disc for nonexistent type member not handled correctly" \
"(expected status 1, match of *$(printf %q "$exp"); got status $e, $(printf %q "$got"))"
# ======
exit $((Errors<125?Errors:125))