2385. [bug] A condition variable in socket.c could leak in

			rare error handling [RT #17968].

diff --git a/CHANGES b/CHANGES
index 5ccb6f70ceb352541a477be79ca46468602fbe54..f815c4d24dc1029bcd5ad33c29cc911c6a630006 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2385.  [bug]           A condition variable in socket.c could leak in
+                       rare error handling [RT #17968].
+
 2384.  [security]      Additional support for query port randomization (change
                        #2375) including performance improvement and port range
                        specification.  [RT #17949, #18098]

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 73ac0acb4ec7b18dfad7fb1ac28949934c9c7e88..bd6d8ac3359e7b03a5b9c55c191c6b991f71652a 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.30.18.20 2007/08/28 07:20:06 tbox Exp $ */
+/* $Id: socket.c,v 1.30.18.21 2008/06/25 23:19:58 jinmei Exp $ */
 
 /* This code has been rewritten to take advantage of Windows Sockets
  * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -2839,6 +2839,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
         */
        result = event_thread_create(&evthread, manager);
        if (result != ISC_R_SUCCESS) {
+               isc_condition_destroy(&manager->shutdown_ok);
                DESTROYLOCK(&manager->lock);
                isc_mem_put(mctx, manager, sizeof(*manager));
                return (result);