* When looking up ports for a service, the lookup succeeds and the

returned address family isn't IPv4 or IPv6, properly free the allocated 
memory from the service lookup. Found by Uli Zappe.
* When looking up ports for a service, only look up TCP ports.

svn path=/branches/BRANCH_6-3/; revision=4855

2 files changed, 7 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 10237e5f..cde27dba 100644
--- a/NEWS
+++ b/NEWS
@@ -85,6 +85,10 @@ fetchmail 6.3.5 (not yet released):
 * Fetchmail no longer attempts to stat the "-" file in daemon mode -- this is a
   special name to read the RC file from stdin, and cannot always be re-read
   anyways. BerliOS bug #7858.
+* When looking up ports for a service, the lookup succeeds and the returned
+  address family isn't IPv4 or IPv6, properly free the allocated memory from the
+  service lookup. Found by Uli Zappe.
+* When looking up ports for a service, only look up TCP ports.
 
 # CHANGES:
 * Rename all fetchmail-internal lock_* functions to fm_lock_*. Obsoletes
diff --git a/servport.c b/servport.c
index 01b84607..2849f7c2 100644
--- a/servport.c
+++ b/servport.c
@@ -1,6 +1,6 @@
 /** \file servport.c Resolve service name to port number.
  * \author Matthias Andree
- * \date 2005
+ * \date 2005 - 2006
  *
  * Copyright (C) 2005 by Matthias Andree
  * For license terms, see the file COPYING in this directory.
@@ -47,6 +47,7 @@ int servport(const char *service) {
 	memset(&hints, 0, sizeof hints);
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
 	e = getaddrinfo(NULL, service, &hints, &res);
 	if (e) {
 	    report(stderr, GT_("getaddrinfo(NULL, \"%s\") error: %s\n"),
@@ -63,6 +64,7 @@ int servport(const char *service) {
 		break;
 #endif
 		default:
+		    freeaddrinfo(res);
 		    goto err;
 	    }
 	    freeaddrinfo(res);