Ensure that newlines change the linestate when skipping junk.

Sometimes skipline() would skip meaningful characters without letting skipcomment() look at them. Reported-By: Christoph Schied <Christoph.Schied@kit.edu>
fanf2 · Oct 20, 2014 · 90ca2ee · 90ca2ee
1 parent 41848d1
commit 90ca2ee
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/tests/error.c b/tests/error.c
@@ -0,0 +1,4 @@
+#if FOO != 5
+#error
+#endif
+bar
diff --git a/tests/error.experr b/tests/error.experr
diff --git a/tests/error.expout b/tests/error.expout
@@ -0,0 +1,2 @@
+#error
+bar
diff --git a/tests/error.exprc b/tests/error.exprc
@@ -0,0 +1 @@
+1
diff --git a/tests/error.sh b/tests/error.sh
@@ -0,0 +1 @@
+unifdef -DFOO=1 error.c
diff --git a/unifdef.c b/unifdef.c
@@ -1132,10 +1132,14 @@ skiphash(void)
 static const char *
 skipline(const char *cp)
 {
+	const char *pcp;
 	if (*cp != '\0')
 		linestate = LS_DIRTY;
-	while (*cp != '\0')
-		cp = skipcomment(cp + 1);
+	while (*cp != '\0') {
+		cp = skipcomment(pcp = cp);
+		if (pcp == cp)
+			cp++;
+	}
 	return (cp);
 }