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/branches/1.4@312285 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/select.h b/include/asterisk/select.h
index 773b0a54ed60a9d6a8a74529e8536ada24f0b750..5ba189a1022eef1d904dadd19a0383174d378735 100644 (file)
--- a/include/asterisk/select.h
+++ b/include/asterisk/select.h
@@ -37,8 +37,9 @@ extern unsigned int ast_FD_SETSIZE;
 #if !defined(HAVE_VARIABLE_FDSET) && defined(CONFIGURE_RAN_AS_ROOT)
 #define ast_fdset fd_set
 #else
+#define ast_FDMAX      32768
 typedef struct {
-       TYPEOF_FD_SET_FDS_BITS fds_bits[4096 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
+       TYPEOF_FD_SET_FDS_BITS fds_bits[ast_FDMAX / 8 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
 } ast_fdset;
 
 #undef FD_ZERO

diff --git a/main/asterisk.c b/main/asterisk.c
index 58bccfcbbcda478fda022f379c07efe7d0da895b..523e9977901bc5dabaa57670c20fb84e2c9b90ce 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2932,6 +2932,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;
                }
 
@@ -2940,9 +2941,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))