r2739 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-06-20 12:20:12 +0200 (Fri, 20 Jun 2008)
New Revision: 2739

Modified:
   trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
Log:
Fix a number of issues and bugs with regsub():

Allow '\' to escape the next char.

Make '$$' be the same as '&': entire match
XXX: NB: Should we drop the sed(1) usage of '&' here, it means
XXX: a lot of backslashing in query string urls ?

Make $-digit work correctly.

Fixes ticket 249



Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2008-06-20 10:15:56 UTC (rev 2738)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2008-06-20 10:20:12 UTC (rev 2739)
@@ -109,7 +109,8 @@
 	regmatch_t pm[10];
 	regex_t *t;
 	int i, l;
-	char *b, *p, *e;
+	txt res;
+	char *p;
 	const char *s;
 	unsigned u, x;
 
@@ -122,38 +123,31 @@
 		return(str);
 
 	u = WS_Reserve(sp->http->ws, 0);
-	e = p = b = sp->http->ws->f;
-	e += u;
+	res.e = res.b = p = sp->http->ws->f;
+	res.e += u;
 
 	do {
 		/* Copy prefix to match */
-		if (pm[0].rm_so > 0) {
-			if (p + pm[0].rm_so < e)
-				memcpy(p, str, pm[0].rm_so);
-			p += pm[0].rm_so;
-		}
+		Tadd(&res, str, pm[0].rm_so);
 
 		for (s = sub ; *s != '\0'; s++ ) {
-			if (*s == '&') {
+			if (*s == '\\') {
+				if (res.b < res.e)
+					*res.b++ = *++s;
+			} else if (*s == '&') {
 				l = pm[0].rm_eo - pm[0].rm_so;
-				if (l > 0) {
-					if (p + l < e)
-						memcpy(p, str + pm[0].rm_so, l);
-					p += l;
-				}
+				Tadd(&res, str + pm[0].rm_so, l);
+			} else if (*s == '$' && s[1] == '$') {
+				l = pm[0].rm_eo - pm[0].rm_so;
+				Tadd(&res, str + pm[0].rm_so, l);
+				s++;
 			} else if (*s == '$' && isdigit(s[1])) {
-				x = sub[1] - '0';
-				sub++;
+				x = digittoint(*++s);
 				l = pm[x].rm_eo - pm[x].rm_so;
-				if (l > 0) {
-					if (p + l < e)
-						memcpy(p, str + pm[x].rm_so, l);
-					p += l;
-				}
+				Tadd(&res, str + pm[x].rm_so, l);
 			} else {
-				if (p + 1 < e)
-					*p = *s;
-				p++;
+				if (res.b < res.e)
+					*res.b++ = *s;
 			}
 		}
 		str += pm[0].rm_eo;
@@ -163,19 +157,13 @@
 	} while (i != REG_NOMATCH);
 
 	/* Copy suffix to match */
-	l = strlen(str);
-	if (l > 0) {
-		if (p + l < e)
-			memcpy(p, str, l);
-		p += l;
-	}
-	if (p + 1 < e)
-		*p++ = '\0';
-	xxxassert(p <= e);
-	if (p > e) {
+	l = strlen(str) + 1;
+	Tadd(&res, str, l);
+	if (res.b >= res.e) {
 		WS_Release(sp->http->ws, 0);
 		return (str);
 	} 
-	WS_Release(sp->http->ws, p - b);
-	return (b);
+	Tcheck(res);
+	WS_Release(sp->http->ws, p - res.b);
+	return (p);
 }