X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_dns.cpp;h=da468af5fae273a4ace9e1c48f266d45aa5552a7;hb=a876f2c58e2f6f2602ed27da09a6e9c40008a80c;hp=01e911efbe5bc177be398a57cb8c6215e7d30f26;hpb=06bc8df45045a3d1fdc45f793abf7ba72b7403b1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index 01e911efb..da468af5f 100644
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -497,6 +497,7 @@ class MyManager : public Manager, public Timer, public EventHandler
 			case ERROR_NOT_AN_ANSWER:
 			case ERROR_NONSTANDARD_QUERY:
 			case ERROR_FORMAT_ERROR:
+			case ERROR_MALFORMED:
 				return "Malformed answer";
 			case ERROR_SERVER_FAILURE:
 			case ERROR_NOT_IMPLEMENTED:
@@ -539,17 +540,19 @@ class MyManager : public Manager, public Timer, public EventHandler
 		}
 
 		Packet recv_packet;
+		bool valid = false;
 
 		try
 		{
 			recv_packet.Fill(buffer, length);
+			valid = true;
 		}
 		catch (Exception& ex)
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, ex.GetReason());
-			return;
 		}
 
+		// recv_packet.id must be filled in here
 		DNS::Request* request = this->requests[recv_packet.id];
 		if (request == NULL)
 		{
@@ -564,14 +567,20 @@ class MyManager : public Manager, public Timer, public EventHandler
 			return;
 		}
 
-		if (recv_packet.flags & QUERYFLAGS_OPCODE)
+		if (!valid)
+		{
+			ServerInstance->stats.DnsBad++;
+			recv_packet.error = ERROR_MALFORMED;
+			request->OnError(&recv_packet);
+		}
+		else if (recv_packet.flags & QUERYFLAGS_OPCODE)
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received a nonstandard query");
 			ServerInstance->stats.DnsBad++;
 			recv_packet.error = ERROR_NONSTANDARD_QUERY;
 			request->OnError(&recv_packet);
 		}
-		else if (recv_packet.flags & QUERYFLAGS_RCODE)
+		else if (!(recv_packet.flags & QUERYFLAGS_QR) || (recv_packet.flags & QUERYFLAGS_RCODE))
 		{
 			Error error = ERROR_UNKNOWN;