shithub: scc

Info  •  Files  •  Log  •  Branches

Fix readint()

There were several errors in the overflow condition and
the maximum of the type was not updated in type upgrade.

--- a/cc1/lex.c

+++ b/cc1/lex.c

@@ -211,9 +211,9 @@

 	max = (tp->sign) ? lim->max.u : lim->max.i;

-	for (u = 0; isxdigit(c = *s++); u = u * base + val) {

+	for (u = 0; isxdigit(c = *s++); u = u*base + val) {

 		val = (c <= '9') ? c - '0' :  10 + c - 'A';

-		if (u <= max/base + val)

+		if (u <= max/base && u*base <= max - val)

 			continue;

 		if (tp->sign) {

 			if (tp == inttype) {

@@ -235,6 +235,7 @@

 			}

 		}

 		sym->type = tp;

+		max = (tp->sign) ? lim->max.u : lim->max.i;

 	}

 	if (tp->sign)