diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2016-12-15 21:44:34 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2016-12-15 21:44:34 +0300 |
| commit | 523aee98fca29d008595cb004f541558a10e3445 (patch) | |
| tree | 69cb7c47eedc384f823db5252c36680cc6d57316 /src/core | |
| parent | 3294292b667ffa9ad55c7bd2e59943bd6eca4a4d (diff) | |
| download | nginx-523aee98fca29d008595cb004f541558a10e3445.tar.gz nginx-523aee98fca29d008595cb004f541558a10e3445.tar.bz2 | |
Resolver: fixed possible use-after-free in worker on fast shutdown.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_resolver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index bdfed88ed..834196a0a 100644 --- 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); } |