turn a crash into right error - dnsname exception escaping

diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
index fc04d9bf65db480d1168b43b6271c92bbcd321ef..0cece837810fba72c66b3276b769f36361657f7a 100644 (file)
--- a/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@ -406,10 +406,17 @@ string PacketReader::getLabel()
   vector<uint8_t> content(d_content);
   content.insert(content.begin(), sizeof(dnsheader), 0);
 
-  string ret = DNSName((const char*) content.data(), content.size(), d_pos + sizeof(dnsheader), true /* uncompress */, 0 /* qtype */, 0 /* qclass */, &consumed).toString();
+  try {
+    string ret = DNSName((const char*) content.data(), content.size(), d_pos + sizeof(dnsheader), true /* uncompress */, 0 /* qtype */, 0 /* qclass */, &consumed).toString();
+    
+    d_pos+=consumed;
+    return ret;
+  }
+  catch(...)
+    {
+      throw std::out_of_range("dnsname issue");
+    }
 
-  d_pos+=consumed;
-  return ret;
 }
 
 static string txtEscape(const string &name)