Skip to content

ext/standard: Fix proc_open() crash on macOS older than the build SDK #22607

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

Open
bukka wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −2
Open

ext/standard: Fix proc_open() crash on macOS older than the build SDK #22607

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
20 changes: 18 additions & 2 deletions ext/standard/proc_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,24 @@
#include <spawn.h>
#define USE_POSIX_SPAWN

/* The non-_np variant is in macOS 26 (and _np deprecated) */
#ifdef HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR
/* The non-_np variant is in POSIX and macOS 26 (which deprecated _np). On Apple, the configure
* link check succeeds whenever the SDK exports the symbol even if the running OS is older - the
* reference is then weakly linked and resolves to NULL at runtime - so when the deployment target
* is older than macOS 26, the variant has to be picked at runtime. */
#if defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR) \
&& defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP) && defined(__APPLE__) \
&& (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < 260000)
static int php_posix_spawn_file_actions_addchdir(
posix_spawn_file_actions_t *file_actions, const char *path)
{
if (__builtin_available(macOS 26.0, *)) {
return posix_spawn_file_actions_addchdir(file_actions, path);
} else {
return posix_spawn_file_actions_addchdir_np(file_actions, path);
}
}
#define POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR php_posix_spawn_file_actions_addchdir
#elif defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)
#define POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR posix_spawn_file_actions_addchdir
#else
#define POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR posix_spawn_file_actions_addchdir_np
Expand Down
Loading