diff options
| author | Denys Vlasenko | 2019-09-22 18:26:05 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2019-10-21 16:54:40 +0200 |
| commit | 3004510fdc7dfb0c511cfdc0011011bf65a75345 (patch) | |
| tree | db0b57dc068e55b21ca8c3b54c80fedd31e3d6fc | |
| parent | d6a8784f2790f72b1d147e099f48aeb480b29f1a (diff) | |
| download | busybox-3004510fdc7dfb0c511cfdc0011011bf65a75345.zip busybox-3004510fdc7dfb0c511cfdc0011011bf65a75345.tar.gz | |
ash: fix BASE##nn bashism to accept letter 'digits' for bases > 9
function old new delta
evaluate_string 873 876 +3
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | shell/math.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/shell/math.c b/shell/math.c index eaf4f24..0c806ad 100644 --- a/shell/math.c +++ b/shell/math.c @@ -538,9 +538,16 @@ static arith_t strto_arith_t(const char *nptr, char **endptr) n = 0; nptr = *endptr + 1; /* bash allows "N#" (empty "nnnn" part) */ - while (isdigit(*nptr)) { + for (;;) { + unsigned digit = (unsigned)*nptr - '0'; + if (digit >= 10 || digit >= base) { + digit = (unsigned)(*nptr | 0x20) - ('a' - 10); + if (digit >= base) + break; + } /* bash does not check for overflows */ - n = n * base + (*nptr++ - '0'); + n = n * base + digit; + nptr++; } *endptr = (char*)nptr; return n; |