JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

actually catch out of [1;36] bounds integer bases

Browse Source
This commit is contained in:
tg 2011-12-09 20:40:26 +00:00
parent f42044258f
commit f8098a7f48
2 changed files with 8 additions and 9 deletions

13
funcs.c

@ -38,7 +38,7 @@
#endif #endif
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.203 2011/12/09 20:40:14 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.204 2011/12/09 20:40:25 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -616,9 +616,9 @@ c_typeset(const char **wp)
struct block *l; struct block *l;
struct tbl *vp, **p; struct tbl *vp, **p;
uint32_t fset = 0, fclr = 0, flag; uint32_t fset = 0, fclr = 0, flag;
int thing = 0, field, base, optc; int thing = 0, field = 0, base = 0, optc;
const char *opts; const char *opts;
const char *fieldstr, *basestr; const char *fieldstr = NULL, *basestr = NULL;
bool localv = false, func = false, pflag = false, istset = true; bool localv = false, func = false, pflag = false, istset = true;
switch (**wp) { switch (**wp) {
@ -649,7 +649,6 @@ c_typeset(const char **wp)
/* see comment below regarding possible opions */ /* see comment below regarding possible opions */
opts = istset ? "L#R#UZ#afi#lnprtux" : "p"; opts = istset ? "L#R#UZ#afi#lnprtux" : "p";
fieldstr = basestr = NULL;
builtin_opt.flags |= GF_PLUSOPT; builtin_opt.flags |= GF_PLUSOPT;
/* /*
* AT&T ksh seems to have 0-9 as options which are multiplied * AT&T ksh seems to have 0-9 as options which are multiplied
@ -740,12 +739,12 @@ c_typeset(const char **wp)
} }
} }
field = 0;
if (fieldstr && !bi_getn(fieldstr, &field)) if (fieldstr && !bi_getn(fieldstr, &field))
goto errout; goto errout;
base = 0; if (basestr && (!bi_getn(basestr, &base) || base < 1 || base > 36)) {
if (basestr && !bi_getn(basestr, &base)) bi_errorf("%s: %s", "bad integer base", basestr);
goto errout; goto errout;
}
if (!(builtin_opt.info & GI_MINUSMINUS) && wp[builtin_opt.optind] && if (!(builtin_opt.info & GI_MINUSMINUS) && wp[builtin_opt.optind] &&
(wp[builtin_opt.optind][0] == '-' || (wp[builtin_opt.optind][0] == '-' ||

4
sh.h

@ -151,9 +151,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.508 2011/12/03 00:01:28 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.509 2011/12/09 20:40:26 tg Exp $");
#endif #endif
#define MKSH_VERSION "R40 2011/12/02" #define MKSH_VERSION "R40 2011/12/09"
/* arithmetics types */ /* arithmetics types */
typedef int32_t mksh_ari_t; typedef int32_t mksh_ari_t;