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 crashes caused by 'typeset -RF' (#47)

Browse source 
Variables created with 'typeset -RF' were being treated as
short integers, even though they are actually floating point
values. As a result the following example will cause a crash:

$ typeset -RF foo=1
$ test "$foo"

This is fixed by checking for 'NV_DOUBLE' with 'nv_isattr',
which prevents ksh from treating floating point values as
short integers due to '== NV_INT16P' excluding 'NV_DOUBLE'.
This bugfix was backported from ksh93v- 2013-10-10-alpha.

src/cmd/ksh93/sh/array.c,
src/cmd/ksh93/sh/name.c,
src/cmd/ksh93/sh/nvdisc:
- Avoid treating floating point values as short integers by
  checking for 'NV_DOUBLE' with 'nv_isattr'.

src/cmd/ksh93/tests/types.sh:
- Add a regression test for the 'typeset -RF' crash. The
  crash cannot be replicated if 'typeset -RF' sets 'foo'
  to zero.
This commit is contained in:
Johnothan King 2020-06-28 15:30:27 -07:00 committed by GitHub
parent c870be9fea
commit 5135cf651c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
NEWS
View file

@ -3,6 +3,11 @@ For full details, see the git log at: https://github.com/ksh93/ksh
Any uppercase BUG_* names are modernish shell bug IDs. Any uppercase BUG_* names are modernish shell bug IDs.
2020-06-28:
- Variables created with 'typeset -RF' no longer cause a memory fault
when accessed.
2020-06-26: 2020-06-26:
- Changing to a directory that has a name starting with a '.' will no - Changing to a directory that has a name starting with a '.' will no

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

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

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

@ -578,7 +578,7 @@ static char *array_getval(Namval_t *np, Namfun_t *disc)
return(cp); return(cp);
} }
#if SHOPT_FIXEDARRAY #if SHOPT_FIXEDARRAY
if(ap->fixed && nv_isattr(np,NV_INT16P) == NV_INT16) if(ap->fixed && nv_isattr(np,NV_INT16P|NV_DOUBLE) == NV_INT16)
np->nvalue.s = *np->nvalue.sp; np->nvalue.s = *np->nvalue.sp;
#endif /* SHOPT_FIXEDARRAY */ #endif /* SHOPT_FIXEDARRAY */
return(nv_getv(np,&ap->hdr)); return(nv_getv(np,&ap->hdr));

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

@ -1648,7 +1648,7 @@ void nv_putval(register Namval_t *np, const char *string, int flags)
return; return;
} }
up= &np->nvalue; up= &np->nvalue;
if(nv_isattr(np,NV_INT16P) == NV_INT16) if(nv_isattr(np,NV_INT16P|NV_DOUBLE) == NV_INT16)
{ {
if(!np->nvalue.up || !nv_isarray(np)) if(!np->nvalue.up || !nv_isarray(np))
{ {

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

@ -862,7 +862,7 @@ static void *num_clone(register Namval_t *np, void *val)
size = sizeof(Sflong_t); size = sizeof(Sflong_t);
else if(nv_isattr(np,NV_SHORT)) else if(nv_isattr(np,NV_SHORT))
{ {
if(nv_isattr(np,NV_INT16P)==NV_INT16P) if(nv_isattr(np,NV_INT16P|NV_DOUBLE)==NV_INT16P)
size = sizeof(short); size = sizeof(short);
else else
return((void*)np->nvalue.ip); return((void*)np->nvalue.ip);

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

@ -645,4 +645,9 @@ Bar_t bar
bar.foo+=(bam) bar.foo+=(bam)
[[ ${bar.foo[0]} == bam ]] || err_exit 'appending to empty array variable in type does not create element 0' [[ ${bar.foo[0]} == bam ]] || err_exit 'appending to empty array variable in type does not create element 0'
# ======
# 'typeset -RF' should not create variables that cause crashes
"$SHELL" -c 'typeset -RF foo=1; test $foo' || err_exit 'typeset -RF does not work'
# ======
exit $((Errors<125?Errors:125)) exit $((Errors<125?Errors:125))