Merge branch 'PHP-8.4' into PHP-8.5

devnexen · devnexen · commit af5eae34272e · 2026-02-22T19:58:41.000Z
* PHP-8.4:
  ext/pcntl: Fix cpuset leak in pcntl_setcpuaffinity on out-of-range CPU ID
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
@@ -1782,6 +1782,7 @@ PHP_FUNCTION(pcntl_setcpuaffinity)
 
 		if (cpu < 0 || cpu >= maxcpus) {
 			zend_argument_value_error(2, "cpu id must be between 0 and " ZEND_ULONG_FMT " (" ZEND_LONG_FMT ")", maxcpus, cpu);
+			PCNTL_CPU_DESTROY(mask);
 			RETURN_THROWS();
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1782,6 +1782,7 @@ PHP_FUNCTION(pcntl_setcpuaffinity)`
`1782`	`1782`
`1783`	`1783`	`if (cpu < 0 \|\| cpu >= maxcpus) {`
`1784`	`1784`	`zend_argument_value_error(2, "cpu id must be between 0 and " ZEND_ULONG_FMT " (" ZEND_LONG_FMT ")", maxcpus, cpu);`
	`1785`	`+ PCNTL_CPU_DESTROY(mask);`
`1785`	`1786`	`RETURN_THROWS();`
`1786`	`1787`	`}`
`1787`	`1788`