# HG changeset patch # User Igor Sysoev # Date 1321287145 0 # Node ID 7740d2a8d55bc5c5ebdb9b58487cceb0a58f41f0 # Parent 8d6c2f2c0d2afcd7b7750b33d5dc1c184c937c85 Merge of r4268: Fixed compression pointer processing in DNS response greater than 255 bytes. Thanks to Ben Hawkes. diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -1922,7 +1922,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; @@ -1932,12 +1938,6 @@ done: if (n != 0) { *dst++ = '.'; } - - } else { - n = ((n & 0x3f) << 8) + *src; - src = &buf[n]; - - n = *src++; } if (n == 0) {