Skip to content

Fix file descriptor leak when proc_open() descriptor setup fails #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iliaal wants to merge 1 commit into from
+23 −4
Closed

Fix file descriptor leak when proc_open() descriptor setup fails #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions ext/standard/proc_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,7 +1371,6 @@ PHP_FUNCTION(proc_open)

if (newprocok == FALSE) {
DWORD dw = GetLastError();
close_all_descriptors(descriptors, ndesc);
char *msg = php_win32_error_to_msg(dw);
php_error_docref(NULL, E_WARNING, "CreateProcess failed: %s", msg);
php_win32_error_msg_free(msg);
Expand All @@ -1388,7 +1387,6 @@ PHP_FUNCTION(proc_open)

if (close_parentends_of_pipes(&factions, descriptors, ndesc) == FAILURE) {
posix_spawn_file_actions_destroy(&factions);
close_all_descriptors(descriptors, ndesc);
goto exit_fail;
}

Expand All @@ -1408,7 +1406,6 @@ PHP_FUNCTION(proc_open)
}
posix_spawn_file_actions_destroy(&factions);
if (r != 0) {
close_all_descriptors(descriptors, ndesc);
php_error_docref(NULL, E_WARNING, "posix_spawn() failed: %s", strerror(r));
goto exit_fail;
}
Expand Down Expand Up @@ -1450,7 +1447,6 @@ PHP_FUNCTION(proc_open)
_exit(127);
} else if (child < 0) {
/* Failed to fork() */
close_all_descriptors(descriptors, ndesc);
php_error_docref(NULL, E_WARNING, "Fork failed: %s", strerror(errno));
goto exit_fail;
}
Expand Down Expand Up @@ -1540,6 +1536,9 @@ PHP_FUNCTION(proc_open)
} else {
exit_fail:
_php_free_envp(env);
if (descriptors) {
close_all_descriptors(descriptors, ndesc);
}
RETVAL_FALSE;
}

Expand Down
20 changes: 20 additions & 0 deletions ext/standard/tests/general_functions/proc_open_fd_leak_on_setup_failure.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
proc_open() does not leak file descriptors when descriptor setup fails mid-spec
--SKIPIF--
<?php
if (!function_exists("proc_open")) die("skip proc_open() unavailable");
if (!@is_dir("/proc/self/fd")) die("skip requires /proc/self/fd");
?>
--FILE--
<?php
$before = count(scandir("/proc/self/fd"));
for ($i = 0; $i < 100; $i++) {
// Index 0 opens a real pipe; index 1 is invalid, so setup fails after the
// pipe is already open. The aborted call must release the pipe fds.
@proc_open("true", [0 => ["pipe", "r"], 1 => ["bogus_type"]], $pipes);
}
$after = count(scandir("/proc/self/fd"));
var_dump($after <= $before + 2);
?>
--EXPECT--
bool(true)
Loading