php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  ext/pcntl: fix pcntl_setns() error handling.
This commit is contained in:
David Carlier
2026-02-22 19:06:54 +00:00
parent 4c65b3e674 e2a5909ba3
commit 14bb2aa9c7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ext/pcntl/pcntl.c
View File

@@ -1631,7 +1631,7 @@ PHP_FUNCTION(pcntl_setns)
pid = pid_is_null ? getpid() : pid;
fd = syscall(SYS_pidfd_open, pid, 0);
if (errno) {
if (fd == -1) {
PCNTL_G(last_error) = errno;
switch (errno) {
case EINVAL:
@@ -1657,11 +1657,12 @@ PHP_FUNCTION(pcntl_setns)
RETURN_FALSE;
}
ret = setns(fd, (int)nstype);
int setns_errno = errno;
close(fd);
if (ret == -1) {
PCNTL_G(last_error) = errno;
switch (errno) {
PCNTL_G(last_error) = setns_errno;
switch (setns_errno) {
case ESRCH:
zend_argument_value_error(1, "process no longer available (" ZEND_LONG_FMT ")", pid);
RETURN_THROWS();
@@ -1671,11 +1672,11 @@ PHP_FUNCTION(pcntl_setns)
RETURN_THROWS();
case EPERM:
php_error_docref(NULL, E_WARNING, "Error %d: No required capability for this process", errno);
php_error_docref(NULL, E_WARNING, "Error %d: No required capability for this process", setns_errno);
break;
default:
php_error_docref(NULL, E_WARNING, "Error %d", errno);
php_error_docref(NULL, E_WARNING, "Error %d", setns_errno);
}
RETURN_FALSE;
} else {