From: bert hubert <bert.hubert@powerdns.com>
Date: Thu, 7 Jan 2016 12:37:17 +0000 (+0100)
Subject: don't return nonsense when toString() is called on an unset or invalid ComboAddress
X-Git-Tag: dnsdist-1.0.0-alpha2~119^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c44d3917d0aa3d2ce0b25b2f69deab7b2301cbfd;p=thirdparty%2Fpdns.git

don't return nonsense when toString() is called on an unset or invalid ComboAddress
---

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index e15d26a954..50455066bf 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -211,9 +211,10 @@ union ComboAddress {
   string toString() const
   {
     char host[1024];
-    getnameinfo((struct sockaddr*) this, getSocklen(), host, sizeof(host),0, 0, NI_NUMERICHOST);
-      
-    return host;
+    if(sin4.sin_family && !getnameinfo((struct sockaddr*) this, getSocklen(), host, sizeof(host),0, 0, NI_NUMERICHOST))
+      return host;
+    else
+      return "invalid";
   }
 
   string toStringWithPort() const