From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 1 Apr 2011 10:58:45 +0000 (+0000)
Subject: Merged revisions 312287 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~246
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b17b0a7fa8644f6479b874dfd02a494016e59db7;p=thirdparty%2Fasterisk.git

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

diff --git a/include/asterisk/select.h b/include/asterisk/select.h
index ac2284fc71..a8f7c3c607 100644
--- a/include/asterisk/select.h
+++ b/include/asterisk/select.h
@@ -38,8 +38,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 edb3241a62..c6bcb1915b 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -3397,6 +3397,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;
 		}
 
@@ -3405,9 +3406,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))