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

			rare error handling [RT #17968].

diff --git a/CHANGES b/CHANGES
index c21b7ebc1a8063196c35241080fca2f4a23c3227..00dcd93f4f575190c1ad251dddc30f6ead6d92c8 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 d80d593d6765a42745de8b12af51c1eae6828210..8ca8721e6994630d81a09caaed97105aee3e27d1 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.52.94.2 2008/03/27 23:46:28 tbox Exp $ */
+/* $Id: socket.c,v 1.52.94.3 2008/06/25 23:19:05 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
@@ -2841,6 +2841,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);