Ignore the alternate stack if the handler is off

cfaf64b9 · Federico G. Schwindt · 0a360b4c · cfaf64b9 · cfaf64b9
Commit cfaf64b9 authored Sep 24, 2017 by Federico G. Schwindt
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

cache_main.c bin/varnishd/cache/cache_main.c +2 -1

c00057.vtc bin/varnishtest/tests/c00057.vtc +9 -0

No files found.
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -124,7 +124,8 @@ void
 THR_Init(void)
 {
 #ifdef HAVE_SIGALTSTACK
-       AZ(sigaltstack(&altstack, NULL));
+	if (altstack.ss_sp != NULL)
+		AZ(sigaltstack(&altstack, NULL));
 #endif
 }


--- a/bin/varnishtest/tests/c00057.vtc
+++ b/bin/varnishtest/tests/c00057.vtc
@@ -39,3 +39,12 @@ client c1 {
 } -run

 varnish v1 -cliok "panic.clear"
+
+# Also check without the handler
+varnish v1 -cliok "param.set sigsegv_handler off"
+varnish v1 -vcl+backend {} -start
+
+client c1 {
+	txreq
+	rxresp
+} -run