Merge pull request #21 from fastly/kate/update-for-trigraphs

Update for escaping ? to avoid emitting trigraphs
fastly · Jun 6, 2023 · 07e33d1 · 07e33d1
2 parents 55fc8f9 + 0f85a2d
commit 07e33d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/print/c.c b/src/print/c.c
@@ -80,9 +80,11 @@ c_escputc_str(FILE *f, const struct fsm_options *opt, char c)
 	 * Escaping '/' here is a lazy way to avoid keeping state when
 	 * emitting '*', '/', since this is used to output example strings
 	 * inside comments.
+	 *
+	 * Escaping '?' is a cheap way to avoid accidentally emitting trigraphs.
 	 */
 
-	if (!isprint((unsigned char) c) || c == '/') {
+	if (!isprint((unsigned char) c) || c == '/' || c == '?') {
 		return fprintf(f, "\\%03o", (unsigned char) c);
 	}
 

diff --git a/tests/retest/tests_2.tst b/tests/retest/tests_2.tst
@@ -16,3 +16,10 @@ R pcre
 +
 -xyz
 
+# avoid generating trigraphs (!) in strncmp()/memcmp() for inlined strings
+~^abc\?\?-$
++abc??-
+-abc???-
+-abc~
+-abc
+