Changeset 761 for trunk/pdns/pdns/dnsparser.cc

Timestamp:

04/22/06 17:30:35 (4 years ago)

Author:

ahu

Message:

fix david g's bug one level up as well - we used to do the wrong thing with truncated packets, leaving untrue an, ns and arcounts around
change version to 3.0.1-snapshot

Files:

• trunk/pdns/pdns/dnsparser.cc (modified) (2 diffs)

trunk/pdns/pdns/dnsparser.cc

@@ -189 +189 @@
   copy(packet+sizeof(dnsheader), packet+len, d_content.begin());
   
-  unsigned int n;
+  unsigned int n=0;
 
   PacketReader pr(d_content);
@@ -235 +235 @@
   }
   catch(out_of_range &re) {
-    if(!(validPacket && d_header.tc)) // don't sweat it over truncated packets
+    if(validPacket && d_header.tc) { // don't sweat it over truncated packets, but do adjust an, ns and arcount
+      if(n < d_header.ancount) {
+        d_header.ancount=n; d_header.nscount = d_header.arcount = 0;
+      }
+      else if(n < d_header.ancount + d_header.nscount) {
+        d_header.nscount = n - d_header.ancount; d_header.arcount=0;
+      }
+      else {
+        d_header.arcount = n - d_header.ancount - d_header.nscount;
+      }
+    }
+    else {
       throw MOADNSException("Error parsing packet of "+lexical_cast<string>(len)+" bytes (rd="+
                             lexical_cast<string>(d_header.rd)+
                             "), out of bounds: "+string(re.what()));
+    }
   }
 }