[master] 0168453 Don't use WS_Overflowed() from panic dumps, it has asserts which can recurse.

Poul-Henning Kamp phk at FreeBSD.org
Tue Feb 2 09:44:21 CET 2016


commit 01684535a0a99175f23536ba0cb228eb99a33f58
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Feb 2 08:17:06 2016 +0000

    Don't use WS_Overflowed() from panic dumps, it has asserts which
    can recurse.

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 47421fe..070f00d 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -141,7 +141,7 @@ pan_ws(struct vsb *vsb, const struct ws *ws)
 	if (pan_already(vsb, ws))
 		return;
 	VSB_indent(vsb, 2);
-	if (WS_Overflowed(ws))
+	if (ws->id[0] & 0x20)
 		VSB_printf(vsb, "OVERFLOW ");
 	VSB_printf(vsb, "id = \"%s\",\n",  ws->id);
 	VSB_printf(vsb, "{s,f,r,e} = {%p",  ws->s);
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index 9293d9e..cd63f49 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -252,6 +252,7 @@ WS_ReleaseP(struct ws *ws, char *ptr)
 	ws->r = NULL;
 	WS_Assert(ws);
 }
+
 int
 WS_Overflowed(const struct ws *ws)
 {



More information about the varnish-commit mailing list