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

Enforce integer base limits of 2 to 64 (#139)

Browse source 
src/cmd/ksh93/bltins/typeset.c: b_typeset():
- For integer bases change argnum check to default values that
  are < 2 or > 64 to 10 instead of allowing invalid base values
  that ksh cannot process.

src/cmd/ksh93/bltins/typeset.c: setall():
- Remove argnum check for integer base of 1 as base cannot be 1.
- Relocate strlen(name) to inside of conditional check for
  np->nvfun as this code does not need to run all.
- Remove no-op oldname code

src/cmd/ksh93/tests/attributes.sh:
- Add typeset -i base bounds checks to default base 10
This commit is contained in:
hyenias 2020-10-04 05:18:34 -04:00 committed by GitHub
parent cefec34774
commit 6697edba1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cmd/ksh93/bltins/typeset.c
View file

@ -320,7 +320,7 @@ int b_typeset(int argc,register char *argv[],Shbltin_t *context)
troot = tdata.sh->fun_tree;
break;
case 'i':
if(!opt_info.arg || (tdata.argnum = opt_info.num) <0)
if(!opt_info.arg || (tdata.argnum = opt_info.num) <2 || tdata.argnum >64)
tdata.argnum = 10;
flag |= NV_INTEGER;
break;
@ -806,15 +806,9 @@ static int setall(char **argv,register int flag,Dt_t *troot,struct tdata *tp
nv_setattr(np,newflag&~NV_ASSIGN);
else
{
char *oldname=0;
int len=strlen(name);
if(tp->argnum==1 && newflag==NV_INTEGER && nv_isattr(np,NV_INTEGER))
tp->argnum = 10;
if(np->nvfun && !nv_isarray(np) && name[len-1]=='.')
if(np->nvfun && !nv_isarray(np) && name[strlen(name)-1]=='.')
newflag |= NV_NODISC;
nv_newattr (np, newflag&~NV_ASSIGN,tp->argnum);
if(oldname)
np->nvname = oldname;
}
}
if(tp->help && !nv_isattr(np,NV_MINIMAL|NV_EXPORT))

8
src/cmd/ksh93/tests/attributes.sh
View file

@ -552,5 +552,13 @@ do unset foo
done
unset expect
unset base
for base in 0 1 65
do unset x
typeset -i $base x
[[ $(typeset -p x) == 'typeset -i x' ]] || err_exit "typeset -i base limits failed to default to 10 with base: $base."
done
unset x base
# ======
exit $((Errors<125?Errors:125))