fix TCP related crashes due to HUUUUGE daum.net records (3.5kbyte!)

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@440 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index 7068bcb9ff1f01f012d0e646b894f49b330b8791..0f60d57bb51799dedd9bf051524c2f86606306e5 100644 (file)
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -91,12 +91,13 @@ int LWRes::asyncresolve(const string &ip, const char *domain, int type, bool doT
     ret=arecvfrom(reinterpret_cast<char *>(d_buf), d_bufsize-1,0,(struct sockaddr*)(&toaddr), &addrlen, &d_len, p.d.id);
   }
   else {
+    //    cerr<<"do tcp"<<endl;
     Socket s(InterNetwork, Stream);
     IPEndpoint ie(ip, 53);
     s.setNonBlocking();
     s.connect(ie);
 
-    int len=htons(p.len);
+    unsigned int len=htons(p.len);
     char *lenP=(char*)&len;
     const char *msgP=p.getData();
     string packet=string(lenP, lenP+2)+string(msgP, msgP+p.len);
@@ -121,7 +122,11 @@ int LWRes::asyncresolve(const string &ip, const char *domain, int type, bool doT
       //      cerr<<"arecvtcp: timeout"<<endl;
       return 0;
     }
-
+    if(len > d_bufsize) {
+      d_bufsize=len;
+      delete[] d_buf;
+      d_buf = new unsigned char[d_bufsize];
+    }
     memcpy(d_buf, packet.c_str(), len);
     d_len=len;
     ret=1;

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index fbc94d7c5068d6b51422c910759696f6dba1bc52..eb1fa71bd5379f49368699be7c681eef3eca4199 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -246,8 +246,9 @@ void startDoResolve(void *p)
     const char *buffer=R->getData();
 
     if(!R->d_tcp) {
-      if(R->len > 512) 
+      if(R->len > 512) {
        R->truncate(512);
+      }
 
       sendto(R->getSocket(),buffer,R->len,0,(struct sockaddr *)(R->remote),R->d_socklen);
     }

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 7a66b8c0558b80a3aa2e75bbac4579b12994c4d7..91dddf97bb79525c72417d4ebe2cdefa34b3226b 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -411,7 +411,7 @@ int SyncRes::doResolveAt(set<string> nameservers, string auth, const string &qna
       }
 
       result=d_lwr.result();
-
+      
       if(d_lwr.d_tcbit) {
        if(!doTCP) {
          doTCP=true;