[master] 7e4442d92 vbe: Do not assert in panic code

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Fri May 17 09:20:12 UTC 2024


commit 7e4442d926818db5c8e34c912df42de822802c23
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu May 16 11:55:02 2024 +0200

    vbe: Do not assert in panic code

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 935527015..978d50c5d 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -474,8 +474,9 @@ vbe_panic(const struct director *d, struct vsb *vsb)
 {
 	struct backend *bp;
 
-	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-	CAST_OBJ_NOTNULL(bp, d->priv, BACKEND_MAGIC);
+	PAN_CheckMagic(vsb, d, DIRECTOR_MAGIC);
+	bp = d->priv;
+	PAN_CheckMagic(vsb, bp, BACKEND_MAGIC);
 
 	VCP_Panic(vsb, bp->conn_pool);
 	VSB_printf(vsb, "hosthdr = %s,\n", bp->hosthdr);


More information about the varnish-commit mailing list