summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3ddeedd)
whenever the base was small enough that more than one digit could
still fit after UINTMAX_MAX/36-1 was reached, only the first would be
allowed; subsequent digits would trigger spurious overflow, making it
impossible to read the largest values in low bases.
};
#define SLIM (UINT_MAX/36-1)
};
#define SLIM (UINT_MAX/36-1)
-#define LLIM (UINTMAX_MAX/36-1)
int __intparse(struct intparse *v, const void *buf, size_t n)
{
const unsigned char *s = buf;
int d, b = v->base;
int __intparse(struct intparse *v, const void *buf, size_t n)
{
const unsigned char *s = buf;
int d, b = v->base;
v->cnt += n;
for (; n; n--, s++) switch (v->state) {
v->cnt += n;
for (; n; n--, s++) switch (v->state) {
v->state++;
v->val = v->small;
case 5:
v->state++;
v->val = v->small;
case 5:
- for (; n && (d=digits[*s])<b && v->val<=LLIM; n--, s++)
+ llim = UINTMAX_MAX/b;
+ for (; n && (d=digits[*s])<b && v->val<=llim && d<=UINTMAX_MAX-v->val*b; n--, s++)
v->val = v->val * b + d;
if (!n) return 1;
if (d >= b) goto finished;
v->val = v->val * b + d;
if (!n) return 1;
if (d >= b) goto finished;
- if (v->val <= (UINTMAX_MAX-d)/b)
- v->val = v->val * b + d;
- else
- v->err = ERANGE;
case 6:
if (n && digits[*s]<b) {
v->err = ERANGE;
case 6:
if (n && digits[*s]<b) {
v->err = ERANGE;