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

diff --git a/CHANGES b/CHANGES
index 5316b03eca0078f6b7f3efb80b4f859c87cefbbb..083cb437eab3a1337f43c5b5ccecc8ddfbf96a15 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2646.  [bug]           Incorrect cleanup on error in socket.c. [RT #19987]
+
 2645.  [port]          "gcc -m32" didn't work on amd64 and x86_64 platforms
                        which default to 64 bits. [RT #19927]
 

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index ee4a279a1be0db39b67c2909f1b4960049ca9836..55b0d44bd21d4cc7ac5e97758c52f465299881ba 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.275.10.40 2009/04/18 01:30:34 jinmei Exp $ */
+/* $Id: socket.c,v 1.275.10.41 2009/08/13 02:19:18 marka Exp $ */
 
 /*! \file */
 
@@ -3647,7 +3647,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);