+ * Fix incorrect `compressed datagram contains loop' error.

@@ -1,6 +1,7 @@
   Bugfixes:
+  * Fix incorrect `compressed datagram contains loop' error.

diff --git a/changelog b/changelog
index 60b0c43cdfd3a15389164c1d4c00feb93dafe032..93c5634e92bb2f1c3289935ef3f74f0cda782456 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 adns (0.10) unstable; urgency=low
 
   Bugfixes:
 adns (0.10) unstable; urgency=low
 
   Bugfixes:

+  * Fix incorrect `compressed datagram contains loop' error.

   * Actually compile shared libraries by default !
 
   General Improvements:
   * Actually compile shared libraries by default !
 
   General Improvements:

diff --git a/src/parse.c b/src/parse.c
index b643e8948815ce6182691b76177c42aba747a676..12200aca53465ef6bb53b201e0e4d1595ab6aef6 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -69,10 +69,9 @@ void adns__findlabel_start(findlabel_state *fls, adns_state ads,
 
 adns_status adns__findlabel_next(findlabel_state *fls,
                                 int *lablen_r, int *labstart_r) {
 
 adns_status adns__findlabel_next(findlabel_state *fls,
                                 int *lablen_r, int *labstart_r) {

-  int lablen, jumped, jumpto;
+  int lablen, jumpto;

   const char *dgram;
 
   const char *dgram;
 

-  jumped= 0;

   dgram= fls->dgram;
   for (;;) {
     if (fls->cbyte >= fls->dglen) goto x_truncated;
   dgram= fls->dgram;
   for (;;) {
     if (fls->cbyte >= fls->dglen) goto x_truncated;


@@ -80,10 +79,6 @@ adns_status adns__findlabel_next(findlabel_state *fls,
     GET_B(fls->cbyte,lablen);
     if (!(lablen & 0x0c0)) break;
     if ((lablen & 0x0c0) != 0x0c0) return adns_s_unknownformat;
     GET_B(fls->cbyte,lablen);
     if (!(lablen & 0x0c0)) break;
     if ((lablen & 0x0c0) != 0x0c0) return adns_s_unknownformat;

-    if (jumped++) {
-      adns__diag(fls->ads,fls->serv,fls->qu,"compressed datagram contains loop");
-      return adns_s_invalidresponse;
-    }

     if (fls->cbyte >= fls->dglen) goto x_truncated;
     if (fls->cbyte >= fls->max) goto x_badresponse;
     GET_B(fls->cbyte,jumpto);
     if (fls->cbyte >= fls->dglen) goto x_truncated;
     if (fls->cbyte >= fls->max) goto x_badresponse;
     GET_B(fls->cbyte,jumpto);


@@ -104,7 +99,6 @@ adns_status adns__findlabel_next(findlabel_state *fls,
     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;
   }
   *lablen_r= lablen;
     if (fls->dmend_r) *(fls->dmend_r)= fls->cbyte;
   }
   *lablen_r= lablen;

-/*if (labstart_r) fprintf(stderr,"label %d >%.*s<\n",lablen,lablen,fls->dgram+*labstart_r);*/

   return adns_s_ok;
 
  x_truncated:
   return adns_s_ok;
 
  x_truncated: