2646. [bug] Incorrect cleanup on error in socket.c. [RT #19987]

diff --git a/CHANGES b/CHANGES
index 1eaa45ba7cf7b32992ebb1493419bf4a6610431c..727e2ef8ed3035d911484c015a61f878a1fe95bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2646.  [bug]           Incorrect cleanup on error in socket.c. [RT #19987]
+
 2642.  [bug]           nsupdate could dump core on solaris when reading
                        improperly formatted key files.  [RT #20015]
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index f49b14e8bb747091769d1aa636d249ba86b75581..e5034f4270751e7afb21ad48ef9e0e8741566a56 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.237.18.66 2009/02/18 00:54:25 marka Exp $ */
+/* $Id: socket.c,v 1.237.18.67 2009/08/13 02:19:39 marka Exp $ */
 
 /*! \file */
 
@@ -3294,7 +3294,7 @@ setup_watcher(isc_mem_t *mctx, isc_socketmgr_t *manager) {
                                          manager->maxsocks);
        if (manager->fdpollinfo == NULL) {
                isc_mem_put(mctx, manager->events,
-                           sizeof(pollinfo_t) * manager->maxsocks);
+                           sizeof(struct pollfd) * manager->nevents);
                return (ISC_R_NOMEMORY);
        }
        memset(manager->fdpollinfo, 0, sizeof(pollinfo_t) * manager->maxsocks);