Escape question marks in C-strings to avoid accidentally generating

tri-graphs. Fixes #1566

Escape question marks in C-strings to avoid accidentally generating
tri-graphs. Fixes #1566
4e3aa514 · Poul-Henning Kamp · Lasse Karstensen · 1c64de28 · 4e3aa514 · 4e3aa514
Commit 4e3aa514 authored Aug 27, 2014 by Poul-Henning Kamp Committed by Lasse Karstensen Jan 27, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

r01566.vtc bin/varnishtest/tests/r01566.vtc +9 -0

vcc_compile.c lib/libvcc/vcc_compile.c +1 -0

No files found.
--- a/bin/varnishtest/tests/r01566.vtc
+++ b/bin/varnishtest/tests/r01566.vtc
+varnishtest "escape issue in regexp"
+
+varnish v1 -vcl {
+	backend b1 { .host = "127.0.0.1"; }
+
+	sub vcl_recv {
+		set req.url = regsuball(req.url, "\??(p|pi)=.*?(&|$)", "");
+	} 
+}
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -211,6 +211,7 @@ EncString(struct vsb *sb, const char *b, const char *e, int mode)
 	VSB_cat(sb, "\"");
 	for (; b < e; b++) {
 		switch (*b) {
+		case '?':	// Trigraphs
 		case '\\':
 		case '"':
 			VSB_printf(sb, "\\%c", *b);