]> git.kaiwu.me - nginx.git/commitdiff
Fixed compression pointer processing in DNS response greater than 255 bytes.
authorIgor Sysoev <igor@sysoev.ru>
Wed, 9 Nov 2011 13:54:07 +0000 (13:54 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Wed, 9 Nov 2011 13:54:07 +0000 (13:54 +0000)
Thanks to Ben Hawkes.

src/core/ngx_resolver.c

index 268faa456395a023e87b253cab403bc6ab39b3e7..35818a7aef6dbcbe1656bea0da9c1eb147552d83 100644 (file)
@@ -1952,7 +1952,13 @@ done:
     n = *src++;
 
     for ( ;; ) {
-        if (n != 0xc0) {
+        if (n & 0xc0) {
+            n = ((n & 0x3f) << 8) + *src;
+            src = &buf[n];
+
+            n = *src++;
+
+        } else {
             ngx_memcpy(dst, src, n);
             dst += n;
             src += n;
@@ -1962,12 +1968,6 @@ done:
             if (n != 0) {
                 *dst++ = '.';
             }
-
-        } else {
-            n = ((n & 0x3f) << 8) + *src;
-            src = &buf[n];
-
-            n = *src++;
         }
 
         if (n == 0) {