Mercurial > hg > nginx

changeset 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 25d0d6dabe00
children 259e2a76e8fb
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
@@ -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);
         }