PROXY1: Avoid AN() on malformed input.

fd80d9d6 · Dag Haavi Finstad · 22004936 · fd80d9d6 · fd80d9d6
Commit fd80d9d6 authored Apr 28, 2015 by Dag Haavi Finstad
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

cache_proxy_proto.c bin/varnishd/proxy/cache_proxy_proto.c +2 -1

o00000.vtc bin/varnishtest/tests/o00000.vtc +6 -0

No files found.
--- a/bin/varnishd/proxy/cache_proxy_proto.c
+++ b/bin/varnishd/proxy/cache_proxy_proto.c
@@ -66,7 +66,8 @@ vpx_proto1(const struct worker *wrk, struct req *req)
 	VSL(SLT_Debug, req->sp->fd, "PROXY1");

 	q = strchr(req->htc->rxbuf_b, '\r');
-	AN(q);
+	if (!q)
+		return (-1);

 	*q++ = '\0';
 	/* Nuke the CRNL */

--- a/bin/varnishtest/tests/o00000.vtc
+++ b/bin/varnishtest/tests/o00000.vtc
@@ -157,3 +157,9 @@ client c1 {
 } -run
 delay .1

+# Malformed (missing \r)
+client c1 {
+       send "PROXY TCP4 1.2.3.4 5.6.7.8 1234 5678\n"
+       expect_close
+} -run
+delay .1