Set SA_ONSTACK too when zend signals are disabled and in pcntl

dunglas · dunglas · commit 04d9d21a695c · 2022-10-16T12:21:40.000+02:00
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -1483,7 +1483,7 @@ static void zend_set_timeout_ex(zend_long seconds, bool reset_signals) /* {{{ */
 
 			act.sa_handler = zend_timeout_handler;
 			sigemptyset(&act.sa_mask);
-			act.sa_flags = SA_RESETHAND | SA_NODEFER;
+			act.sa_flags = SA_ONSTACK | SA_RESETHAND | SA_NODEFER
 			sigaction(signo, &act, NULL);
 #  else
 			signal(signo, zend_timeout_handler);
diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c
@@ -35,7 +35,7 @@ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
 	} else {
 		sigemptyset(&act.sa_mask);
 	}
-	act.sa_flags = 0;
+	act.sa_flags = SA_ONSTACK;
 #ifdef HAVE_STRUCT_SIGINFO_T
 	act.sa_flags |= SA_SIGINFO;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ Sigfunc php_signal4(int signo, Sigfunc func, int restart, int mask_all)`
`35`	`35`	`} else {`
`36`	`36`	`sigemptyset(&act.sa_mask);`
`37`	`37`	`}`
`38`		`- act.sa_flags = 0;`
	`38`	`+ act.sa_flags = SA_ONSTACK;`
`39`	`39`	`#ifdef HAVE_STRUCT_SIGINFO_T`
`40`	`40`	`act.sa_flags \|= SA_SIGINFO;`
`41`	`41`	`#endif`