fix obscure bug in strtoull reading the highest 16 possible values

[musl] / src / internal / intparse.c

diff --git a/src/internal/intparse.c b/src/internal/intparse.c
index fd403b5..ffd06fe 100644 (file)
--- a/src/internal/intparse.c
+++ b/src/internal/intparse.c
@@ -70,6 +70,8 @@ int __intparse(struct intparse *v, const void *buf, size_t n)
                        for (; n && *s-'0'<10U && v->small<=SLIM; n--, s++)
                                v->small = v->small * 10 + (*s-'0');
                } else if ((b&-b) == b) {
+                       /* Compute bitshift for power-of-two bases
+                        * using a De Bruijn B(2,3) sequence. */
                        int bs = "\0\1\2\4\7\3\6\5"[(0x17*b)>>5&7];
                        for (; n && (d=digits[*s])<b && v->small<=SLIM; n--, s++)
                                v->small = (v->small<<bs) + d;
@@ -85,7 +87,7 @@ int __intparse(struct intparse *v, const void *buf, size_t n)
                        v->val = v->val * b + d;
                if (!n) return 1;
                if (d >= b) goto finished;
-               if (v->val < (UINTMAX_MAX-d)/b)
+               if (v->val <= (UINTMAX_MAX-d)/b)
                        v->val = v->val * b + d;
                else
                        v->err = ERANGE;