[master] e70297446 vcp: Destroy unused VCP_Ref() pool with vcp_destroy()

Walid Boudebouda walid.boudebouda at gmail.com
Mon Apr 7 10:28:05 UTC 2025


commit e702974463c886329a0d77267a916e0dc7aba867
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri Mar 14 16:32:30 2025 +0100

    vcp: Destroy unused VCP_Ref() pool with vcp_destroy()

diff --git a/bin/varnishd/cache/cache_conn_pool.c b/bin/varnishd/cache/cache_conn_pool.c
index 7e8519fbe..9aba217b2 100644
--- a/bin/varnishd/cache/cache_conn_pool.c
+++ b/bin/varnishd/cache/cache_conn_pool.c
@@ -235,7 +235,7 @@ vcp_destroy(struct conn_pool **cpp)
 	AZ(cp->n_conn);
 	AZ(cp->n_kill);
 	Lck_Delete(&cp->mtx);
-	free(cp->endpoint);
+	FREE_OBJ(cp->endpoint);
 	FREE_OBJ(cp);
 }
 
@@ -824,10 +824,6 @@ VCP_Ref(const struct vrt_endpoint *vep, const char *ident)
 	cp2->refcnt++;
 	Lck_Unlock(&conn_pools_mtx);
 
-	Lck_Delete(&cp->mtx);
-	AZ(cp->n_conn);
-	AZ(cp->n_kill);
-	FREE_OBJ(cp->endpoint);
-	FREE_OBJ(cp);
+	vcp_destroy(&cp);
 	return (cp2);
 }


More information about the varnish-commit mailing list