[master] b6118c3b8 sml: Do not assert in panic code

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


commit b6118c3b8cacdcaec0f1bc3209d934a04154b5b0
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Fri May 17 07:39:38 2024 +0200

    sml: Do not assert in panic code

diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index c92304593..ba658a8f7 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -748,7 +748,8 @@ SML_panic(struct vsb *vsb, const struct objcore *oc)
 	VSB_printf(vsb, "Simple = %p,\n", oc->stobj->priv);
 	if (oc->stobj->priv == NULL)
 		return;
-	CAST_OBJ_NOTNULL(o, oc->stobj->priv, OBJECT_MAGIC);
+	o = oc->stobj->priv;
+	PAN_CheckMagic(vsb, o, OBJECT_MAGIC);
 	sml_panic_st(vsb, "Obj", o->objstore);
 
 #define OBJ_FIXATTR(U, l, sz) \


More information about the varnish-commit mailing list