Skip to content
Snippets Groups Projects
Commit e6e929f5 authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge remote-tracking branch 'public/bug8209'

parents 73182e32 da6720e9
Branches
Tags
No related merge requests found
o Minor bugfixes:
- When detecting the largest possible file descriptor (in order to close
all file descriptors when launching a new program), actually use
_SC_OPEN_MAX. The old code for doing this was very, very broken.
Fix for bug 8209; bugfix on 0.2.3.1-alpha. Found by Coverity; this
is CID 743383.
......@@ -3834,12 +3834,13 @@ tor_spawn_background(const char *const filename, const char **argv,
child_state = CHILD_STATE_MAXFD;
#ifdef _SC_OPEN_MAX
if (-1 != max_fd) {
if (-1 == max_fd) {
max_fd = (int) sysconf(_SC_OPEN_MAX);
if (max_fd == -1)
if (max_fd == -1) {
max_fd = DEFAULT_MAX_FD;
log_warn(LD_GENERAL,
"Cannot find maximum file descriptor, assuming %d", max_fd);
}
}
#else
max_fd = DEFAULT_MAX_FD;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment