From: Attila Molnar <attilamolnar@hush.com>
Date: Thu, 16 Apr 2015 16:04:03 +0000 (+0200)
Subject: Reject replies to DNS PTR requests that contain invalid characters
X-Git-Tag: v2.0.23~67
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;ds=sidebyside;h=6058483d9fbc1b904d5ae7cfea47bfcde5c5b559;p=user%2Fhenk%2Fcode%2Finspircd.git

Reject replies to DNS PTR requests that contain invalid characters

Fixes issue #1033 reported by @ping86
---

diff --git a/src/dns.cpp b/src/dns.cpp
index 75e5731fe..14305ccab 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -700,8 +700,16 @@ DNSResult DNS::GetResult()
 				/* Identical handling to PTR */
 
 			case DNS_QUERY_PTR:
+			{
 				/* Reverse lookups just come back as char* */
 				resultstr = std::string((const char*)data.first);
+				if (resultstr.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.-") != std::string::npos)
+				{
+					std::string ro = req->orig;
+					delete req;
+					return DNSResult(this_id | ERROR_MASK, "Invalid char(s) in reply", 0, ro);
+				}
+			}
 			break;
 
 			default: