diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-05-28 14:36:04 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-05-28 14:53:13 +0200 |
| commit | c58a47ea2e7d2fb173dbdd122a1b65aaaf6c6039 (patch) | |
| tree | 10c234b890587123097ea4d18eb3c5451e005a69 /pimd | |
| parent | Merge pull request #6469 from mjstapp/add_ubu_20_doc (diff) | |
| download | frr-c58a47ea2e7d2fb173dbdd122a1b65aaaf6c6039.tar.xz frr-c58a47ea2e7d2fb173dbdd122a1b65aaaf6c6039.zip | |
pimd: Fix crash on restart from thread_cancel
We were using thread_cancel() directly instead of
THREAD_OFF which correctly ensures the pointer is not NULL.
Ticket:CM-29866
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_zlookup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 49c221f8e..dc4c621e9 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -125,7 +125,7 @@ static void zclient_lookup_failed(struct zclient *zlookup) void zclient_lookup_free(void) { - thread_cancel(zlookup_read); + THREAD_OFF(zlookup_read); zclient_stop(zlookup); zclient_free(zlookup); zlookup = NULL; |