summaryrefslogtreecommitdiff
path: root/lib/thread.c
diff options
context:
space:
mode:
authorMark Stapp <mjs@voltanet.io>2020-06-11 11:16:02 -0400
committerMark Stapp <mjs@voltanet.io>2020-06-11 15:31:54 -0400
commit41b21bfa600731a4096d1c9372b365acaef4065f (patch)
treedf14a976094b6ad10a459ed378df882a212ec9a5 /lib/thread.c
parentdbb482bf33123dbcaeecb5f1477681f7dbaf8dc2 (diff)
*: have daemons call frr_fini() at termination
Fix a number of library and daemon issues so that daemons can call frr_fini() during normal termination. Without this, temporary logging files are left behind in /var/tmp/frr/. Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'lib/thread.c')
-rw-r--r--lib/thread.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/thread.c b/lib/thread.c
index 4d689a9f88..9b2f5661ac 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -1094,7 +1094,8 @@ static void do_thread_cancel(struct thread_master *master)
}
/* Delete and free all cancellation requests */
- list_delete_all_node(master->cancel_req);
+ if (master->cancel_req)
+ list_delete_all_node(master->cancel_req);
/* Wake up any threads which may be blocked in thread_cancel_async() */
master->canceled = true;