Ensure that transports call VDP_Close()

varnishcache · Mar 1, 2024 · bb3d027 · bb3d027
1 parent 20aee1b
commit bb3d027
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
@@ -59,7 +59,15 @@ VDP_Panic(struct vsb *vsb, const struct vdp_ctx *vdc)
 	VSB_cat(vsb, "},\n");
 }
 
-
+/*
+ * Ensure that transports have called VDP_Close()
+ * to avoid leaks in VDPs
+ */
+void
+VDP_Fini(struct vdp_ctx *vdc)
+{
+	assert(VTAILQ_EMPTY(&vdc->vdp));
+}
 
 void
 VDP_Init(struct vdp_ctx *vdc, struct worker *wrk, struct vsl_log *vsl,

diff --git a/bin/varnishd/cache/cache_req.c b/bin/varnishd/cache/cache_req.c
@@ -313,6 +313,8 @@ Req_Cleanup(struct sess *sp, struct worker *wrk, struct req *req)
 		wrk->stats->ws_client_overflow++;
 
 	wrk->seen_methods = 0;
+
+	VDP_Fini(req->vdc);
 }
 
 /*----------------------------------------------------------------------

diff --git a/bin/varnishd/cache/cache_varnishd.h b/bin/varnishd/cache/cache_varnishd.h
@@ -189,6 +189,7 @@ void VDI_Event(const struct director *d, enum vcl_event_e ev);
 void VDI_Init(void);
 
 /* cache_deliver_proc.c */
+void VDP_Fini(struct vdp_ctx *vdc);
 void VDP_Init(struct vdp_ctx *vdc, struct worker *wrk, struct vsl_log *vsl,
     struct req *req);
 uint64_t VDP_Close(struct vdp_ctx *, struct objcore *, struct boc *);