From: Ruslan Ermilov <ru@nginx.com>
Date: Thu, 15 Dec 2016 18:44:34 +0000 (+0300)
Subject: Resolver: fixed possible use-after-free in worker on fast shutdown.
X-Git-Tag: release-1.11.8~21
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=523aee98fca29d008595cb004f541558a10e3445;p=nginx.git

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

diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index bdfed88ed..834196a0a 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -300,6 +300,10 @@ ngx_resolver_cleanup(void *data)
 #endif
 
         if (r->event) {
+            if (r->event->timer_set) {
+                ngx_del_timer(r->event);
+            }
+
             ngx_free(r->event);
         }