Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / cups / http-addr.c

diff --git a/cups/http-addr.c b/cups/http-addr.c
index b16961886bdca31295f1dc8e63b8eb82952430d0..0bc71f6fa711f08e172bd68cfd5a0127bef06672 100644 (file)
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -249,12 +249,13 @@ httpAddrLookup(
 int                                    /* O - Port number */
 _httpAddrPort(http_addr_t *addr)       /* I - Address */
 {
+  if (!addr)
+    return (ippPort());
 #ifdef AF_INET6
-  if (addr->addr.sa_family == AF_INET6)
+  else if (addr->addr.sa_family == AF_INET6)
     return (ntohs(addr->ipv6.sin6_port));
-  else
 #endif /* AF_INET6 */
-  if (addr->addr.sa_family == AF_INET)
+  else if (addr->addr.sa_family == AF_INET)
     return (ntohs(addr->ipv4.sin_port));
   else
     return (ippPort());