From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 24 May 2016 02:13:54 +0000 (-0400)
Subject: httpAddrConnect2 could get into an infinite loop for socket errors.
X-Git-Tag: v2.2b1~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34016d2a5d29a9a399908d003f4ba461fc0e38e3;p=thirdparty%2Fcups.git

httpAddrConnect2 could get into an infinite loop for socket errors.
---

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index 90965457e4..f74d9ed7a6 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -132,9 +132,12 @@ httpAddrConnect2(
       {
        /*
 	* Don't abort yet, as this could just be an issue with the local
-	* system not being configured with IPv4/IPv6/domain socket enabled...
+	* system not being configured with IPv4/IPv6/domain socket enabled.
+	*
+	* Just skip this address...
 	*/
 
+        addrlist = addrlist->next;
 	continue;
       }
 
@@ -213,6 +216,7 @@ httpAddrConnect2(
       {
 	DEBUG_printf(("1httpAddrConnect2: Unable to connect to %s:%d: %s", httpAddrString(&(addrlist->addr), temp, sizeof(temp)), httpAddrPort(&(addrlist->addr)), strerror(errno)));
 	httpAddrClose(NULL, fds[nfds]);
+	addrlist = addrlist->next;
 	continue;
       }