diff options
| author | Denys Vlasenko | 2019-09-22 18:26:05 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2019-09-22 18:26:05 +0200 |
| commit | ca1ce4b9fa2b48f8898a51782543fe32546ba1ec (patch) | |
| tree | 9bdde33fa93749361e594d32c97d615a4e813562 /shell/math.c | |
| parent | f159352112671e3c1e07356ebf6f590d8f79c8ff (diff) | |
| download | busybox-ca1ce4b9fa2b48f8898a51782543fe32546ba1ec.zip busybox-ca1ce4b9fa2b48f8898a51782543fe32546ba1ec.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>
Diffstat (limited to 'shell/math.c')
| -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; |