diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-06-11 18:47:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 18:47:01 -0400 |
| commit | 110597aa04169a1594549e0d6a53859b7e7be8ff (patch) | |
| tree | f2d8061a96bd9cecac6550858854a29d6394ba48 /lib/thread.c | |
| parent | dbb482bf33123dbcaeecb5f1477681f7dbaf8dc2 (diff) | |
| parent | d617669d3776509363fd0d37eb240fb5dc0fdeaa (diff) | |
Merge pull request #6566 from mjstapp/fix_daemon_fini
*: have daemons call frr_fini() at termination
Diffstat (limited to 'lib/thread.c')
| -rw-r--r-- | lib/thread.c | 3 |
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; |