[master] 0f248ea Don't recurse into cleanup

Poul-Henning Kamp phk at FreeBSD.org
Thu Nov 9 18:41:07 UTC 2017


commit 0f248ea50ac9e173a8c221bb14b19456d8bed704
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Nov 9 09:24:58 2017 +0000

    Don't recurse into cleanup

diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index d610421..950b003 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -813,7 +813,12 @@ int
 fail_out(void)
 {
 	unsigned old_err;
+	static int once = 0;
 
+	if (once++) {
+		vtc_log(vltop, 1, "failure during reset");
+		return(vtc_error);
+	}
 	old_err = vtc_error;
 	if (!vtc_stop)
 		vtc_stop = 1;


More information about the varnish-commit mailing list