diff options
| author | Russ White <russ@riw.us> | 2019-09-17 07:27:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 07:27:12 -0400 |
| commit | 321b1efab2d66ff8d7a868ca6ef6b0bd879f8f32 (patch) | |
| tree | 939d6898e9ea4b020f30ba1a7ef6d673868980b6 /lib/libfrr.c | |
| parent | fe8d933c2c778647b3fbb75340ea4f752c77137d (diff) | |
| parent | df54f0536ec0fa84034bfa5e5205d612dc1321df (diff) | |
Merge pull request #4810 from qlyoung/fix-pthread-bad-pointer
Fix potential frr_pthread.c stale pointer
Diffstat (limited to 'lib/libfrr.c')
| -rw-r--r-- | lib/libfrr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libfrr.c b/lib/libfrr.c index 4301dc20ad..478fe4e205 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -42,6 +42,7 @@ #include "northbound_db.h" #include "debug.h" #include "frrcu.h" +#include "frr_pthread.h" DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm)) DEFINE_KOOH(frr_early_fini, (), ()) @@ -681,6 +682,8 @@ struct thread_master *frr_init(void) memory_init(); log_filter_cmd_init(); + frr_pthread_init(); + log_ref_init(); log_ref_vty_init(); lib_error_init(); @@ -1076,6 +1079,7 @@ void frr_fini(void) db_close(); #endif log_ref_fini(); + frr_pthread_finish(); zprivs_terminate(di->privs); /* signal_init -> nothing needed */ thread_master_free(master); |