summaryrefslogtreecommitdiff
path: root/pimd/pim_upstream.c
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2022-06-24 10:05:42 -0400
committerGitHub <noreply@github.com>2022-06-24 10:05:42 -0400
commitff97a24bc351ba4d34196ffbf0ee0c25ff5b52a1 (patch)
treef8cf43ab969d9138135e038eb918ea9165672e77 /pimd/pim_upstream.c
parent4cd26be0f32d169341770a8a990a3069d33536ca (diff)
parent30247bd637c35ab04f4993e67a36961e4204f12c (diff)
Merge pull request #11467 from mobash-rasool/fixes2
pimd: Avoid accessing freed memory
Diffstat (limited to 'pimd/pim_upstream.c')
-rw-r--r--pimd/pim_upstream.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 3817d5d9e1..54a7f59ca4 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1948,8 +1948,8 @@ void pim_upstream_terminate(struct pim_instance *pim)
struct pim_upstream *up;
while ((up = rb_pim_upstream_first(&pim->upstream_head))) {
- pim_upstream_del(pim, up, __func__);
- pim_upstream_timers_stop(up);
+ if (pim_upstream_del(pim, up, __func__))
+ pim_upstream_timers_stop(up);
}
rb_pim_upstream_fini(&pim->upstream_head);