2413. [bug] Fixed an unreachable code path in socket.c. [RT #18442]

diff --git a/CHANGES b/CHANGES
index 704d3b09c02509fbc46d6a0b84023c20d4d03ca5..69f9298f8100f0c2980b6df70d98ff070fa15aab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2413.  [bug]           Fixed an unreachable code path in socket.c. [RT #18442]
+
 2412.  [bug]           win32: address a resourse leak. [RT #18374]
 
 2411.  [bug]           Allow using a larger number of sockets than FD_SETSIZE

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index c6816e05cb6a97f70cd3dc08730ab17b32f388f9..c19a67f1cf49098d37bd5331101c790f275ec480 100644 (file)
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.207.2.19.2.51 2008/08/07 23:45:31 tbox Exp $ */
+/* $Id: socket.c,v 1.207.2.19.2.52 2008/08/09 19:04:23 jinmei Exp $ */
 
 #include <config.h>
 
@@ -2904,7 +2904,7 @@ process_ctlfd(isc_socketmgr_t *manager) {
                 * Nothing to read?
                 */
                if (msg == SELECT_POKE_NOTHING)
-                       return (ISC_FALSE);
+                       break;
 
                /*
                 * Handle shutdown message.  We really should