diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-04-01 10:59:32 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-04-01 10:59:32 +0000 |
| commit | 3731fd9ccce8d93a0bb22f8ba0db277652537335 (patch) | |
| tree | 3f7181612491fd8769545898d5097b44a500865d /main | |
| parent | e59a051c3e94820f6b31f3781707f9e49506db8a (diff) | |
Merged revisions 312286,312288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r312286 | tilghman | 2011-04-01 05:44:33 -0500 (Fri, 01 Apr 2011) | 2 lines
Reload must react correctly against a possibly changed table, so dropping the conditional reload flag.
................
r312288 | tilghman | 2011-04-01 05:58:45 -0500 (Fri, 01 Apr 2011) | 21 lines
Merged revisions 312287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r312287 | tilghman | 2011-04-01 05:51:24 -0500 (Fri, 01 Apr 2011) | 14 lines
Merged revisions 312285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r312285 | tilghman | 2011-04-01 05:36:42 -0500 (Fri, 01 Apr 2011) | 7 lines
Found some leaking file descriptors while looking at ast_FD_SETSIZE dead code.
(issue #18969)
Reported by: oej
Patches:
20110315__issue18969__14.diff.txt uploaded by tilghman (license 14)
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 749491515..4d95466f3 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3402,6 +3402,7 @@ int main(int argc, char *argv[]) fd2 = (l.rlim_cur > sizeof(readers) * 8 ? sizeof(readers) * 8 : l.rlim_cur) - 1; if (dup2(fd, fd2) < 0) { ast_log(LOG_WARNING, "Cannot open maximum file descriptor %d at boot? %s\n", fd2, strerror(errno)); + close(fd); break; } @@ -3410,9 +3411,12 @@ int main(int argc, char *argv[]) if (ast_select(fd2 + 1, &readers, NULL, NULL, &tv) < 0) { ast_log(LOG_WARNING, "Maximum select()able file descriptor is %d\n", FD_SETSIZE); } + ast_FD_SETSIZE = l.rlim_cur > ast_FDMAX ? ast_FDMAX : l.rlim_cur; + close(fd); + close(fd2); } while (0); #elif defined(HAVE_VARIABLE_FDSET) - ast_FD_SETSIZE = l.rlim_cur; + ast_FD_SETSIZE = l.rlim_cur > ast_FDMAX ? ast_FDMAX : l.rlim_cur; #endif /* !defined(CONFIGURE_RAN_AS_ROOT) */ if ((!rungroup) && !ast_strlen_zero(ast_config_AST_RUN_GROUP)) |