From: Denil Vira <denil@cumulusnetworks.com>
Date: Tue, 11 Aug 2015 15:35:52 +0000 (-0700)
Subject: Variable reuse in bgpd.c
X-Git-Tag: frr-2.0-rc1~1286
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4de99d07306529fe53844a9b20c9cd5342b848a4;p=matthieu%2Ffrr.git

Variable reuse in bgpd.c

Ticket : CM-7004
Reviewed by : CCR-3314
Testing : Trivial

In bgp_delete(), variables 'node' and 'next' are overwritten in
the nested for loop.
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 16bfb50407..7651505a65 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -2759,8 +2759,8 @@ bgp_delete (struct bgp *bgp)
 {
   struct peer *peer;
   struct peer_group *group;
-  struct listnode *node;
-  struct listnode *next;
+  struct listnode *node, *pnode;
+  struct listnode *next, *pnext;
   afi_t afi;
   int i;
 
@@ -2791,7 +2791,7 @@ bgp_delete (struct bgp *bgp)
 
   for (ALL_LIST_ELEMENTS (bgp->group, node, next, group))
     {
-      for (ALL_LIST_ELEMENTS (group->peer, node, next, peer))
+      for (ALL_LIST_ELEMENTS (group->peer, pnode, pnext, peer))
 	{
 	  if (BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
 	    {