From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Thu, 23 Jun 2016 19:39:20 +0000 (-0400)
Subject: pimd: Removing extra asserts
X-Git-Tag: frr-2.0-rc1~499
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=09c02cc3c0dd6fcadd57ba085f263a174a75dc50;p=mirror%2Ffrr.git

pimd: Removing extra asserts

in the igmp_group_free path, the normal deletion path
was causing asserts to happen.  There is no need
to have asserts here for this reason.

Further testing done w/ valgrind.

Ticket: CM-11401
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index eacd605006..43fac9a166 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -1078,11 +1078,6 @@ void igmp_startup_mode_on(struct igmp_sock *igmp)
 
 static void igmp_group_free(struct igmp_group *group)
 {
-  zassert(!group->t_group_query_retransmit_timer);
-  zassert(!group->t_group_timer);
-  zassert(group->group_source_list);
-  zassert(!listcount(group->group_source_list));
-
   list_free(group->group_source_list);
 
   XFREE(MTYPE_PIM_IGMP_GROUP, group);
@@ -1109,7 +1104,6 @@ static void igmp_group_delete(struct igmp_group *group)
 
   if (group->t_group_query_retransmit_timer) {
     THREAD_OFF(group->t_group_query_retransmit_timer);
-    zassert(!group->t_group_query_retransmit_timer);
   }
 
   group_timer_off(group);
@@ -1275,7 +1269,7 @@ static int igmp_group_timer(struct thread *t)
 
   zassert(group->group_filtermode_isexcl);
 
-  group->t_group_timer = 0;
+  group->t_group_timer = NULL;
   group->group_filtermode_isexcl = 0;
 
   /* Any source (*,G) is forwarded only if mode is EXCLUDE {empty} */