shithub: scc

Info  •  Files  •  Log  •  Branches

Avoid trashing cpp symbols until be sure is correct

With the previous implementation, the status of the u.s field
could be corrupted, because it was freed, and it was not
put to NULL, and the symbol was still defined.
This new solution removes the problem don't looking the
symbol until be sure that the full #define directive
is correct, so it is impossible to have a wrong state.

--- a/cc1/cpp.c

+++ b/cc1/cpp.c

@@ -364,6 +364,10 @@

 	if (!iden(&s))

 		error("#define must have an identifier as parameter");

+	for (t = s + strlen(s) + 1; isspace(*--t); *t = '\0')

+		/* nothing */;

+	s = mkdefine(s);

+

 	sym = lookup(NS_CPP);

 	if ((sym->flags & ISDEFINED) && sym->ns == NS_CPP) {

 		warn("'%s' redefined", yytext);

@@ -372,10 +376,7 @@

 	sym->flags |= ISDEFINED;

 	sym->ns = NS_CPP;

 	sym->ctx = UCHAR_MAX;

-

-	for (t = s + strlen(s) + 1; isspace(*--t); *t = '\0')

-		/* nothing */;

-	sym->u.s = mkdefine(s);

+	sym->u.s = s;

 }

 static void