r2281 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-11-20 22:47:37 +0100 (Tue, 20 Nov 2007)
New Revision: 2281

Modified:
   trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
Log:
Make <![CDATA[...]]> stateful and handle it correctly across
storage boundaries.  Complain if it isn't closed at the end.


Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c	2007-11-20 21:27:20 UTC (rev 2280)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_esi.c	2007-11-20 21:47:37 UTC (rev 2281)
@@ -80,6 +80,7 @@
 	int			is_esi;
 	int			remflg;	/* inside <esi:remove> </esi:remove> */
 	int			incmt;	/* inside <!--esi ... --> comment */
+	int			incdata; /* inside <![CCDATA[ ... ]]> */
 };
 
 /*--------------------------------------------------------------------
@@ -356,15 +357,33 @@
 	ew->o.b = t.b;
 	ew->o.e = t.b;
 	for (p = t.b; p < t.e; ) {
+		assert(p >= t.b);
+		assert(p < t.e);
+		if (ew->incdata) {
+			/*
+			 * We are inside an <![CDATA[ constuct and mus skip
+			 * to the end marker ]]>.
+			 */
+			if (*p != ']') {
+				p++;
+			} else {
+				if (p + 2 >= t.e)
+					return (p);
+				if (!memcmp(p, "]]>", 3)) {
+					ew->incdata = 0;
+					p += 3;
+				} else 
+					p++;
+			}
+			continue;
+		}
 		if (ew->incmt && *p == '-') {
 			/*
 			 * We are inside an <!--esi comment and need to zap
 			 * the end comment marker --> when we see it.
 			 */
-			if (p + 2 >= t.e) {
-				/* XXX: need to return pending ew->incmt  */
+			if (p + 2 >= t.e)
 				return (p);
-			}
 			if (!memcmp(p, "-->", 3)) {
 				ew->incmt = 0;
 				ew->o.e = p;
@@ -425,18 +444,12 @@
 
 		if (!memcmp(p, "<![CDATA[", i > 9 ? 9 : i)) {
 			/*
-			 * cdata <![CDATA[...]]> at least 12 char
-			 * XXX: can span multiple chunks
+			 * cdata <![CDATA[ at least 9 char
 			 */
-			if (i < 12)
+			if (i < 9)
 				return (p);
-			for (q = p + 9; ; q++) {
-				if (q + 2 >= t.e)
-					return (p);
-				if (!memcmp(q, "]]>", 3))
-					break;
-			}
-			p = q + 3;
+			ew->incdata = 1;
+			p += 9;
 			continue;
 		} 
 
@@ -683,6 +696,9 @@
 		/* 'p' is cached starting point for next storage part */
 	}
 
+	if (ew->incdata)
+		esi_error(ew, ew->t.e, -1,
+		    "ESI 1.0 unterminated <![CDATA[ element");
 	if (ew->remflg)
 		esi_error(ew, ew->t.e, -1,
 		    "ESI 1.0 unterminated <esi:remove> element");