# HG changeset patch
# User Ruslan Ermilov <ru@nginx.com>
# Date 1481889208 -10800
# Node ID 259e2a76e8fbc6b80c5367333e6785d5c2b2df6e
# Parent  a3dc657f4e9530623683e6b85bd7492662e4dc47
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
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -351,6 +351,10 @@ ngx_resolver_cleanup_tree(ngx_resolver_t
             next = ctx->next;
 
             if (ctx->event) {
+                if (ctx->event->timer_set) {
+                    ngx_del_timer(ctx->event);
+                }
+
                 ngx_resolver_free(r, ctx->event);
             }