github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don’t use POSIX_SPAWN_CLOEXEC_DEFAULT on 10.7

Browse Source 
Using this flag on 10.7.5 seems to cause a kernel panic.

Fixes #896.
This commit is contained in:
Allan Odgaard
2013-03-17 15:44:06 +01:00
parent 398e55cdbe
commit dfee671b6a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Frameworks/io/src/exec.cc
View File

@@ -3,6 +3,7 @@
#include <text/format.h>
#include <oak/datatypes.h>
#include <oak/debug/OakDebugLog.h>
#include <oak/compat.h>
OAK_DEBUG_VAR(IO_Exec);
@@ -30,15 +31,21 @@ namespace io
posix_spawnattr_t flags;
pid_t pid = -1;
short closeOnExecFlag = (oak::os_major() == 10 && oak::os_minor() == 7) ? 0 : POSIX_SPAWN_CLOEXEC_DEFAULT;
OAK_CHECK(pipe(&out[0]));
OAK_CHECK(pipe(&err[0]));
OAK_CHECK(fcntl(out[0], F_SETFD, FD_CLOEXEC));
OAK_CHECK(fcntl(err[0], F_SETFD, FD_CLOEXEC));
OAK_CHECK(posix_spawn_file_actions_init(&fileActions));
OAK_CHECK(posix_spawn_file_actions_addclose(&fileActions, 0));
OAK_CHECK(posix_spawn_file_actions_addopen(&fileActions, 0, "/dev/null", O_RDONLY, 0));
OAK_CHECK(posix_spawn_file_actions_adddup2(&fileActions, out[1], 1));
OAK_CHECK(posix_spawn_file_actions_adddup2(&fileActions, err[1], 2));
OAK_CHECK(posix_spawn_file_actions_addclose(&fileActions, out[1]));
OAK_CHECK(posix_spawn_file_actions_addclose(&fileActions, err[1]));
OAK_CHECK(posix_spawnattr_init(&flags));
OAK_CHECK(posix_spawnattr_setflags(&flags, POSIX_SPAWN_SETSIGDEF|POSIX_SPAWN_CLOEXEC_DEFAULT));
OAK_CHECK(posix_spawnattr_setflags(&flags, POSIX_SPAWN_SETSIGDEF|closeOnExecFlag));
OAK_CHECK(posix_spawnattr_setpgroup(&flags, getpid()));
OAK_CHECK(posix_spawn(&pid, argv[0], &fileActions, &flags, argv, env));
OAK_CHECK(posix_spawnattr_destroy(&flags));

9
Frameworks/network/src/tbz.cc
View File

@@ -2,6 +2,7 @@
#include <text/format.h>
#include <text/trim.h>
#include <oak/datatypes.h>
#include <oak/compat.h>
#include <io/environment.h>
namespace network
@@ -18,15 +19,21 @@ namespace network
posix_spawnattr_t flags;
pid_t pid = -1;
short closeOnExecFlag = (oak::os_major() == 10 && oak::os_minor() == 7) ? 0 : POSIX_SPAWN_CLOEXEC_DEFAULT;
bool ok = true;
ok = ok && pipe(&in[0]) == 0;
ok = ok && pipe(&out[0]) == 0;
ok = ok && fcntl(in[1], F_SETFD, FD_CLOEXEC) == 0;
ok = ok && fcntl(out[0], F_SETFD, FD_CLOEXEC) == 0;
ok = ok && posix_spawn_file_actions_init(&fileActions) == 0;
ok = ok && posix_spawn_file_actions_adddup2(&fileActions, in[0], 0) == 0;
ok = ok && posix_spawn_file_actions_adddup2(&fileActions, out[1], 1) == 0;
ok = ok && posix_spawn_file_actions_adddup2(&fileActions, out[1], 2) == 0;
ok = ok && posix_spawn_file_actions_addclose(&fileActions, in[0]) == 0;
ok = ok && posix_spawn_file_actions_addclose(&fileActions, out[1]) == 0;
ok = ok && posix_spawnattr_init(&flags) == 0;
ok = ok && posix_spawnattr_setflags(&flags, POSIX_SPAWN_SETSIGDEF|POSIX_SPAWN_CLOEXEC_DEFAULT) == 0;
ok = ok && posix_spawnattr_setflags(&flags, POSIX_SPAWN_SETSIGDEF|closeOnExecFlag) == 0;
ok = ok && posix_spawn(&pid, "/usr/bin/tar", &fileActions, &flags, (char* const*)argv, env) == 0;
ok = ok && posix_spawnattr_destroy(&flags) == 0;
ok = ok && posix_spawn_file_actions_destroy(&fileActions) == 0;