r3579 - branches/2.0/varnish-cache/lib/libvcl

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-05 09:37:41 +0100 (Thu, 05 Feb 2009)
New Revision: 3579

Modified:
   branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c
Log:
Merge r3318: Check that regexps are constant strings.



Modified: branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c	2009-02-05 08:33:14 UTC (rev 3578)
+++ branches/2.0/varnish-cache/lib/libvcl/vcc_parse.c	2009-02-05 08:37:41 UTC (rev 3579)
@@ -250,6 +250,7 @@
 	switch (tl->t->tok) {
 	case '~':
 		vcc_NextToken(tl);
+		ExpectErr(tl, CSTR);
 		p = vcc_regexp(tl, 0);
 		ERRCHK(tl);
 		vcc_NextToken(tl);