Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mark libnotify FDs as CLO_EXEC

Browse source 
Fixes a fd leak on OS X
This commit is contained in:
ridiculous_fish 2015-01-04 01:21:23 -08:00
parent e340baf6cc
commit 70a99e494d
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
env_universal_common.cpp
View file

@ -1275,9 +1275,18 @@ class universal_notifier_notifyd_t : public universal_notifier_t
} }
if (this->notify_fd >= 0) if (this->notify_fd >= 0)
{ {
// Mark us for non-blocking reads, with CLO_EXEC // Mark us for non-blocking reads, and CLO_EXEC
int flags = fcntl(this->notify_fd, F_GETFL, 0); int flags = fcntl(this->notify_fd, F_GETFL, 0);
fcntl(this->notify_fd, F_SETFL, flags | O_NONBLOCK | FD_CLOEXEC); if (flags >= 0 && ! (flags & O_NONBLOCK))
{
fcntl(this->notify_fd, F_SETFL, flags | O_NONBLOCK);
}
set_cloexec(this->notify_fd);
// Serious hack: notify_fd is likely the read end of a pipe. The other end is owned by libnotify, which does not mark it as CLO_EXEC (it should!)
// The next fd is probably notify_fd + 1
// Do it ourselves. If the implementation changes and some other FD gets marked as CLO_EXEC, that's probably a good thing.
set_cloexec(this->notify_fd + 1);
} }
#endif #endif
} }