]> git.kaiwu.me - nginx.git/commitdiff
Resolver: fixed possible use-after-free in worker on fast shutdown.
authorRuslan Ermilov <ru@nginx.com>
Thu, 15 Dec 2016 18:44:34 +0000 (21:44 +0300)
committerRuslan Ermilov <ru@nginx.com>
Thu, 15 Dec 2016 18:44:34 +0000 (21:44 +0300)
src/core/ngx_resolver.c

index bdfed88edde32a8d180d845a4735ba3ad21087f3..834196a0a4ca90fffd8ab3b6686772b040768df2 100644 (file)
@@ -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);
         }