r4246 - branches/2.0/varnish-cache/bin/varnishtest

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-09-28 11:15:21 +0200 (Mon, 28 Sep 2009)
New Revision: 4246

Modified:
   branches/2.0/varnish-cache/bin/varnishtest/vtc_http.c
Log:
Merge r4044: Don't overrun rxbuf (varnishtest)



Modified: branches/2.0/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishtest/vtc_http.c	2009-09-28 09:05:05 UTC (rev 4245)
+++ branches/2.0/varnish-cache/bin/varnishtest/vtc_http.c	2009-09-28 09:15:21 UTC (rev 4246)
@@ -322,7 +322,7 @@
 		pfd[0].revents = 0;
 		i = poll(pfd, 1, hp->timeout);
 		assert(i > 0);
-		assert(hp->prxbuf < hp->nrxbuf);
+		assert(hp->prxbuf + n < hp->nrxbuf);
 		i = read(hp->fd, hp->rxbuf + hp->prxbuf, n);
 		if (i == 0)
 			return (i);