From ff823fc915874ac18a6144aef18e17638309349b Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 2 Aug 2018 20:02:13 -0400 Subject: [PATCH] pimd: Cleanup rp_info->plist PIM is leaking the plist data structure in some shutdown cases. Additionally trust XFREE Signed-off-by: Donald Sharp --- pimd/pim_rp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c index c1623ec15e..5007d6c174 100644 --- a/pimd/pim_rp.c +++ b/pimd/pim_rp.c @@ -62,6 +62,9 @@ void pim_rp_list_hash_clean(void *data) static void pim_rp_info_free(struct rp_info *rp_info) { + if (rp_info->plist) + XFREE(MTYPE_PIM_FILTER_NAME, rp_info->plist); + XFREE(MTYPE_PIM_RP, rp_info); } @@ -600,7 +603,6 @@ int pim_rp_del(struct pim_instance *pim, const char *rp, if (rp_info->plist) { XFREE(MTYPE_PIM_FILTER_NAME, rp_info->plist); - rp_info->plist = NULL; was_plist = true; } -- 2.39.5