From: Ruslan Ermilov <ru@nginx.com>
Date: Fri, 16 Dec 2016 11:53:28 +0000 (+0300)
Subject: Resolver: fixed possible use-after-free in worker on fast shutdown.
X-Git-Tag: release-1.11.8~20
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=3a8532219a0531d5fbb33e7f4c2f9531c4c924b9;p=nginx.git

Resolver: fixed possible use-after-free in worker on fast shutdown.

The fix in a3dc657f4e95 was incomplete.
---

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 834196a0a..fc25c6633 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -351,6 +351,10 @@ ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree)
             next = ctx->next;
 
             if (ctx->event) {
+                if (ctx->event->timer_set) {
+                    ngx_del_timer(ctx->event);
+                }
+
                 ngx_resolver_free(r, ctx->event);
             }