X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Fintparse.c;h=ffd06fe06655e845ebbc742a8963dd4ac42f84ef;hp=21b07b749b1819c76384db3103a790d95d0f1201;hb=b4a07bb469ad5a81ee003b621c362d2e7be38159;hpb=ecc9c5fcfa4831b290cc1a63c0346cbb0c1fcf42

diff --git a/src/internal/intparse.c b/src/internal/intparse.c
index 21b07b74..ffd06fe0 100644
--- a/src/internal/intparse.c
+++ b/src/internal/intparse.c
@@ -35,6 +35,7 @@ int __intparse(struct intparse *v, const void *buf, size_t n)
 	v->cnt += n;
 	for (; n; n--, s++) switch (v->state) {
 	case 0:
+		v->err = EINVAL;
 		v->state++;
 		if (*s=='+' || *s=='-') {
 			v->neg = *s=='-';
@@ -49,6 +50,7 @@ int __intparse(struct intparse *v, const void *buf, size_t n)
 	case 2:
 		v->state++;
 		if ((!b || b==16) && (*s|32) == 'x') {
+			v->err = 0;
 			v->base = b = 16;
 			continue;
 		}
@@ -57,16 +59,19 @@ int __intparse(struct intparse *v, const void *buf, size_t n)
 	case 3:
 	firstdigit:
 		if (digits[*s] >= b) {
-			v->err = EINVAL;
-			return 0;
+			n++;
+			goto finished;
 		}
 	seconddigit:
+		v->err = 0;
 		v->state++;
 	case 4:
 		if (b==10) {
 			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;
@@ -82,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;
@@ -92,11 +97,11 @@ int __intparse(struct intparse *v, const void *buf, size_t n)
 		if (n && digits[*s]<b) {
 			v->err = ERANGE;
 			v->val = UINTMAX_MAX;
-
 			n--; s++;
+			for (; n && digits[*s]<b; n--, s++);
 		}
-		for (; n && digits[*s]<b; n--, s++);
 		if (!n) return 1;
+		goto finished;
 	}
 	return 1;
 finished: