Fix pcntl_rfork / pcntl_forkx with zend-max-execution-timers

arnaud-lb · arnaud-lb · commit aee1d7fb964a · 2025-06-27T15:46:20.000+02:00
diff --git a/NEWS b/NEWS
@@ -26,6 +26,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-14082 (Segmentation fault on unknown address 0x600000000018
     in ext/opcache/jit/zend_jit.c). (nielsdos)
 
+- PCNTL:
+  . Fixed bug GH-18958 (Fatal error during shutdown after pcntl_rfork() or
+    pcntl_forkx() with zend-max-execution-timers). (Arnaud)
+
 - Standard:
   . Fix misleading errors in printf(). (nielsdos)
   . Fix RCN violations in array functions. (nielsdos)
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
@@ -1277,6 +1277,8 @@ PHP_FUNCTION(pcntl_rfork)
 		default:
 			php_error_docref(NULL, E_WARNING, "Error %d", errno);
 		}
+	} else if (pid == 0) {
+		zend_max_execution_timer_init();
 	}
 
 	RETURN_LONG((zend_long) pid);
@@ -1320,6 +1322,8 @@ PHP_FUNCTION(pcntl_forkx)
 		default:
 			php_error_docref(NULL, E_WARNING, "Error %d", errno);
 		}
+	} else if (pid == 0) {
+		zend_max_execution_timer_init();
 	}
 
 	RETURN_LONG((zend_long) pid);

Original file line number	Diff line number	Diff line change
`@@ -1277,6 +1277,8 @@ PHP_FUNCTION(pcntl_rfork)`
`1277`	`1277`	`default:`
`1278`	`1278`	`php_error_docref(NULL, E_WARNING, "Error %d", errno);`
`1279`	`1279`	`}`
	`1280`	`+ } else if (pid == 0) {`
	`1281`	`+ zend_max_execution_timer_init();`
`1280`	`1282`	`}`
`1281`	`1283`
`1282`	`1284`	`RETURN_LONG((zend_long) pid);`
`@@ -1320,6 +1322,8 @@ PHP_FUNCTION(pcntl_forkx)`
`1320`	`1322`	`default:`
`1321`	`1323`	`php_error_docref(NULL, E_WARNING, "Error %d", errno);`
`1322`	`1324`	`}`
	`1325`	`+ } else if (pid == 0) {`
	`1326`	`+ zend_max_execution_timer_init();`
`1323`	`1327`	`}`
`1324`	`1328`
`1325`	`1329`	`RETURN_LONG((zend_long) pid);`