commit 46b066565e534c4c4770d6391ca258531c4b1016
author Simon Kelley <simon@thekelleys.org.uk> Mon Feb 04 21:47:59 2013 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Mon Feb 04 21:47:59 2013 +0000
tree 98c4f1400c3eb785e6f51b854e2493f030617a62
parent 4dc9c657ada5a959b3c2d1ef290c463248139925

Don't leak sockets when getsockname fails.

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 2ab1bda..00551a1 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -1345,10 +1345,15 @@
 
 	  while ((confd = accept(listener->tcpfd, NULL, NULL)) == -1 && errno == EINTR);
 	  
-	  if (confd == -1 ||
-	      getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) == -1)
+	  if (confd == -1)
 	    continue;
 
+	  if (getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) == -1)
+	    {
+	      close(confd);
+	      continue;
+	    }
+
 	   if (option_bool(OPT_NOWILD))
 	    iface = listener->iface; /* May be NULL */
 	   else