Merge lp:~jamesodhunt/libnih/nih_io_select_fds-check-limits into lp:libnih

[James Hunt]

  * nih/io.c (nih_io_select_fds): Ensure number of fds being managed
    is within limits.

[Scott James Remnant (scott)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-06-20 18:47:02 +0000
+++ ChangeLog	2011-08-26 16:39:33 +0000
@@ -1,3 +1,8 @@
[phone]  James Hunt  <[e-mail]>
+
+	* nih/io.c (nih_io_select_fds): Ensure number of fds being managed
+	  is within limits.
+
 2011-06-20  James Hunt  <[e-mail]>
 
 	* nih/watch.c (nih_watch_handle): Handle non-directory watches;
 
=== modified file 'nih/io.c'
--- nih/io.c	2009-08-03 23:29:41 +0000
+++ nih/io.c	2011-08-26 16:39:33 +0000
@@ -165,6 +165,7 @@
 	nih_assert (readfds != NULL);
 	nih_assert (writefds != NULL);
 	nih_assert (exceptfds != NULL);
+	nih_assert (*nfds <= FD_SETSIZE);
 
 	nih_io_init ();
 
@@ -186,6 +187,9 @@
 			*nfds = nih_max (*nfds, watch->fd + 1);
 		}
 	}
+
+	/* Re-check in case we exceeded the limit in the loop */
+	nih_assert (*nfds <= FD_SETSIZE);
 }
 
 /**