From: Paul Jakma <paul.jakma@sun.com>
Date: Sun, 27 Aug 2006 06:57:47 +0000 (+0000)
Subject: [bgpd] fix mtype in XFREE and NULL out freed pointer
X-Git-Tag: frr-2.0-rc1~2608
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9f906c7c562bd62043c77a79d84967deea9fe45e;p=mirror%2Ffrr.git

[bgpd] fix mtype in XFREE and NULL out freed pointer

2006-08-27 Paul Jakma <paul.jakma@sun.com>

	* bgp_advertise.c: (bgp_sync_delete) fix mtype in XFREE.
	  NULL out peer->hash after free, to be sure.
---

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 99960aef0b..b27132c93a 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-27 Paul Jakma <paul.jakma@sun.com>
+
+	* bgp_advertise.c: (bgp_sync_delete) fix mtype in XFREE.
+	  NULL out peer->hash after free, to be sure.
+
 2006-08-06 Paul Jakma <paul.jakma@sun.com>
 
 	* bgp_aspath.c: (aspath_loop_check) Fix the typo-bug which
diff --git a/bgpd/bgp_advertise.c b/bgpd/bgp_advertise.c
index 3a49ca8523..3a40b1a729 100644
--- a/bgpd/bgp_advertise.c
+++ b/bgpd/bgp_advertise.c
@@ -403,10 +403,11 @@ bgp_sync_delete (struct peer *peer)
     for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
       {
 	if (peer->sync[afi][safi])
-	  XFREE (MTYPE_TMP, peer->sync[afi][safi]);
+	  XFREE (MTYPE_BGP_SYNCHRONISE, peer->sync[afi][safi]);
 	peer->sync[afi][safi] = NULL;
 	
 	if (peer->hash[afi][safi])
 	  hash_free (peer->hash[afi][safi]);
+	peer->hash[afi][safi] = NULL;
       }
 }