Mercurial > hg > nginx

comparison src/core/ngx_resolver.c @ 6843:a3dc657f4e95

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.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 15 Dec 2016 21:44:34 +0300
parents c3e3de6d2672
children 259e2a76e8fb
comparison
equal deleted inserted replaced
6842:25d0d6dabe00 6843:a3dc657f4e95
298 #if (NGX_HAVE_INET6) 298 #if (NGX_HAVE_INET6)
299 ngx_resolver_cleanup_tree(r, &r->addr6_rbtree); 299 ngx_resolver_cleanup_tree(r, &r->addr6_rbtree);
300 #endif 300 #endif
301 301
302 if (r->event) { 302 if (r->event) {
303 if (r->event->timer_set) {
304 ngx_del_timer(r->event);
305 }
306
303 ngx_free(r->event); 307 ngx_free(r->event);
304 } 308 }
305 309
306 310
307 rec = r->connections.elts; 311 rec = r->connections.elts;