technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Router: joint must be checked before memory pool destruction.

Browse Source
This commit is contained in:
Igor Sysoev
2017-07-14 20:34:38 +03:00
parent b5d0920491
commit b3464d563e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nxt_router.c
View File

@@ -1456,6 +1456,7 @@ nxt_router_listen_socket_release(nxt_task_t *task,
static void static void
nxt_router_conf_release(nxt_task_t *task, nxt_socket_conf_joint_t *joint) nxt_router_conf_release(nxt_task_t *task, nxt_socket_conf_joint_t *joint)
{ {
nxt_bool_t exit;
nxt_socket_conf_t *skcf; nxt_socket_conf_t *skcf;
nxt_router_conf_t *rtcf; nxt_router_conf_t *rtcf;
nxt_thread_spinlock_t *lock; 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 remove engine->port */
/* TODO excude from connected ports */ /* 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) { if (rtcf != NULL) {
nxt_debug(task, "old router conf is destroyed"); 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); nxt_mp_destroy(rtcf->mem_pool);
} }
if (nxt_queue_is_empty(&joint->engine->joints)) { if (exit) {
nxt_thread_exit(task->thread); nxt_thread_exit(task->thread);
} }
} }