Commit 33dd226

committed

Merge branch 'PHP-8.2'

* PHP-8.2: Fix GH-8789 and GH-10015: Fix ZTS zend signal crashes due to NULL globals

2 parents b19f556 + d479b5a commit 33dd226Copy full SHA for 33dd226

File tree

-9

lines changed

-9

lines changed

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,18 +87,14 @@ void zend_signal_handler_defer(int signo, siginfo_t siginfo, void context)`
`87`	`87`	`zend_signal_queue_t queue, qtmp;`
`88`	`88`
`89`	`89`	`#ifdef ZTS`
`90`		`- /* A signal could hit after TSRM shutdown, in this case globals are already freed. */`
`91`		`- if (tsrm_is_shutdown()) {`
	`90`	`+ /* A signal could hit after TSRM shutdown, in this case globals are already freed.`
	`91`	`+ * Or it could be delivered to a thread that didn't execute PHP yet.`
	`92`	`+ * In the latter case we act as if SIGG(active) is false. */`
	`93`	`+ if (tsrm_is_shutdown() \|\| !tsrm_is_managed_thread()) {`
`92`	`94`	`/* Forward to default handler handler */`
`93`	`95`	`zend_signal_handler(signo, siginfo, context);`
`94`	`96`	`return;`
`95`	`97`	`}`
`96`		`-`
`97`		`- if (!tsrm_is_managed_thread()) {`
`98`		`- fprintf(stderr, "zend_signal_handler_defer() called in a thread not managed by PHP. The expected signal handler will not be called. This is probably a bug.\n");`
`99`		`-`
`100`		`- return;`
`101`		`- }`
`102`	`98`	`#endif`
`103`	`99`
`104`	`100`	`if (EXPECTED(SIGG(active))) {`
`@@ -186,7 +182,7 @@ static void zend_signal_handler(int signo, siginfo_t siginfo, void context)`
`186`	`182`	`sigset_t sigset;`
`187`	`183`	`zend_signal_entry_t p_sig;`
`188`	`184`	`#ifdef ZTS`
`189`		`- if (tsrm_is_shutdown()) {`
	`185`	`+ if (tsrm_is_shutdown()\|\| !tsrm_is_managed_thread()) {`
`190`	`186`	`p_sig.flags = 0;`
`191`	`187`	`p_sig.handler = SIG_DFL;`
`192`	`188`	`} else`

Comments

(0)