Fail if backend workspace doesn't have room for htc

735523ef · Poul-Henning Kamp · d573f35f · 735523ef
Commit 735523ef authored May 11, 2015 by Poul-Henning Kamp
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cache_backend.c bin/varnishd/cache/cache_backend.c +4 -2

No files found.
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -129,9 +129,11 @@ vbe_dir_getfd(const struct director *d, struct busyobj *bo)
 	    vc->fd, bp->display_name, abuf2, pbuf2, abuf1, pbuf1);

 	vc->backend->vsc->req++;
+	AZ(bo->htc);
+	bo->htc = WS_Alloc(bo->ws, sizeof *bo->htc);
 	if (bo->htc == NULL)
-		bo->htc = WS_Alloc(bo->ws, sizeof *bo->htc);
-	AN(bo->htc);
+		/* XXX: counter ? */
+		return (-1);
 	INIT_OBJ(bo->htc, HTTP_CONN_MAGIC);
 	bo->htc->vbc = vc;
 	bo->htc->fd = vc->fd;