From: Roman Arutyunyan <arut@nginx.com>
Date: Tue, 26 Jan 2016 13:46:18 +0000 (+0300)
Subject: Resolver: fixed possible segmentation fault on DNS format error.
X-Git-Tag: release-1.8.1~6
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=717f65a5072d67e851c5e2f755eb7179a343c112;p=nginx.git

Resolver: fixed possible segmentation fault on DNS format error.
---

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 4e9c85da2..fceeed0af 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1292,7 +1292,7 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n)
         times = 0;
 
         for (q = ngx_queue_head(&r->name_resend_queue);
-             q != ngx_queue_sentinel(&r->name_resend_queue) || times++ < 100;
+             q != ngx_queue_sentinel(&r->name_resend_queue) && times++ < 100;
              q = ngx_queue_next(q))
         {
             rn = ngx_queue_data(q, ngx_resolver_node_t, queue);