From b3464d563e699814d833d6ddf327d70660ddee6b Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 14 Jul 2017 20:34:38 +0300 Subject: [PATCH] Router: joint must be checked before memory pool destruction. --- src/nxt_router.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/nxt_router.c b/src/nxt_router.c index c4679244..9500a9fb 100644 --- a/src/nxt_router.c +++ b/src/nxt_router.c @@ -1456,6 +1456,7 @@ nxt_router_listen_socket_release(nxt_task_t *task, static void nxt_router_conf_release(nxt_task_t *task, nxt_socket_conf_joint_t *joint) { + nxt_bool_t exit; nxt_socket_conf_t *skcf; nxt_router_conf_t *rtcf; nxt_thread_spinlock_t *lock; @@ -1490,6 +1491,9 @@ nxt_router_conf_release(nxt_task_t *task, nxt_socket_conf_joint_t *joint) /* TODO remove engine->port */ /* TODO excude from connected ports */ + /* The joint content can be used before memory pool destruction. */ + exit = nxt_queue_is_empty(&joint->engine->joints); + if (rtcf != NULL) { nxt_debug(task, "old router conf is destroyed"); @@ -1498,7 +1502,7 @@ nxt_router_conf_release(nxt_task_t *task, nxt_socket_conf_joint_t *joint) nxt_mp_destroy(rtcf->mem_pool); } - if (nxt_queue_is_empty(&joint->engine->joints)) { + if (exit) { nxt_thread_exit(task->thread); } }