Mercurial > hg > nginx

changeset 6844:259e2a76e8fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolver: fixed possible use-after-free in worker on fast shutdown. The fix in a3dc657f4e95 was incomplete.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 16 Dec 2016 14:53:28 +0300
parents a3dc657f4e95
children 9abba5b70ea0
files src/core/ngx_resolver.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
             }