# HG changeset patch # User Ruslan Ermilov # Date 1481827474 -10800 # Node ID a3dc657f4e9530623683e6b85bd7492662e4dc47 # Parent 25d0d6dabe00c01114a93c533b6651127e8a11e9 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 --- 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); }