From: Marcin Wisnicki <mwisnicki@gmail.com>
Date: Wed, 30 May 2012 06:09:55 +0000 (-0600)
Subject: Bug 3545: FreeBSD dnsserver segfaults
X-Git-Tag: SQUID_3_1_20~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6e4d570bde9b22204a2060ae9b4fd602a8f212;p=thirdparty%2Fsquid.git

Bug 3545: FreeBSD dnsserver segfaults
---

diff --git a/src/dnsserver.cc b/src/dnsserver.cc
index 139e655bcb..24516ac1a6 100644
--- a/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@ -214,8 +214,10 @@ lookup(const char *buf)
     const bool isDomain = (getaddrinfo(buf,NULL,&hints,&AI) != 0);
 
     // reset for real lookup
-    freeaddrinfo(AI);
-    AI = NULL;
+    if (AI != NULL) {
+        freeaddrinfo(AI);
+        AI = NULL;
+    }
 
     // resolve the address/name
     memset(&hints, '\0', sizeof(struct addrinfo));
@@ -351,7 +353,8 @@ lookup(const char *buf)
         printf("$fail A system error occured looking up Domain/IP '%s': %s.\n", buf, xgai_strerror(res));
     }
 
-    xfreeaddrinfo(AI);
+    if (AI != NULL)
+        xfreeaddrinfo(AI);
 }
 
 /**
@@ -452,7 +455,8 @@ squid_res_setservers(int reset)
         fprintf(stderr, "IPv6 nameservers not supported on this resolver\n");
 #endif
     }
-    freeaddrinfo(AI);
+    if (AI != NULL)
+        freeaddrinfo(AI);
 
 #else /* !HAVE_RES_INIT || !defined(_SQUID_RES_NSADDR_LIST) */