Mercurial > hg > nginx

comparison src/core/ngx_resolver.c @ 6844:259e2a76e8fb

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. The fix in a3dc657f4e95 was incomplete.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 16 Dec 2016 14:53:28 +0300
parents a3dc657f4e95
children 9abba5b70ea0
comparison
equal deleted inserted replaced
6843:a3dc657f4e95 6844:259e2a76e8fb
349 349
350 for (ctx = rn->waiting; ctx; ctx = next) { 350 for (ctx = rn->waiting; ctx; ctx = next) {
351 next = ctx->next; 351 next = ctx->next;
352 352
353 if (ctx->event) { 353 if (ctx->event) {
354 if (ctx->event->timer_set) {
355 ngx_del_timer(ctx->event);
356 }
357
354 ngx_resolver_free(r, ctx->event); 358 ngx_resolver_free(r, ctx->event);
355 } 359 }
356 360
357 ngx_resolver_free(r, ctx); 361 ngx_resolver_free(r, ctx);
358 } 362 }