From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 1 Jan 2018 15:22:57 +0000 (+0200)
Subject: geoipbackend: Skip non-TXT results that format to empty
X-Git-Tag: dnsdist-1.3.0~85^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1337e5a2d52c92c791ea67d1b176784b031606c7;p=thirdparty%2Fpdns.git

geoipbackend: Skip non-TXT results that format to empty
---

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index 7e3aa2470e..724513f3a0 100644
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -294,8 +294,10 @@ bool GeoIPBackend::lookup_static(const GeoIPDomain &dom, const DNSName &search,
           continue;
       }
       if (qtype == QType::ANY || rr.qtype == qtype) {
+        const string& content = format2str(rr.content, ip, v6, gl);
+        if (rr.qtype != QType::TXT && content.empty()) continue;
         d_result.push_back(rr);
-        d_result.back().content = format2str(rr.content, ip, v6, gl);
+        d_result.back().content = content;
         d_result.back().qname = qdomain;
       }
     }