From 3fdca50cc7fc5a15ebeda8914ccdac5d0aa56eaa Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 13 Aug 2009 02:19:39 +0000
Subject: [PATCH] 2646.   [bug]           Incorrect cleanup on error in
 socket.c. [RT #19987]

---
 CHANGES               | 2 ++
 lib/isc/unix/socket.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1eaa45ba7c..727e2ef8ed 100644
--- 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 f49b14e8bb..e5034f4270 100644
--- 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);