# HG changeset patch # User Igor Sysoev # Date 1227201856 0 # Node ID 435b689b61ea73b734497d8b42ec6eff8b4e182a # Parent 0ebecd0c3410915714beec722a32d261d2bd767c r2315 merge: fix compression pointer for big (>255) DNS responses 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 @@ -1836,7 +1836,7 @@ ngx_resolver_copy(ngx_resolver_t *r, ngx } if (n & 0xc0) { - n = (n & 0x3f << 8) + *p; + n = ((n & 0x3f) << 8) + *p; p = &buf[n]; } else { @@ -1886,7 +1886,7 @@ done: } } else { - n = (n & 0x3f << 8) + *src; + n = ((n & 0x3f) << 8) + *src; src = &buf[n]; n = *src++;