[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 99960aef0b1e97adb8ca70b16f1c88a5ec71baac..b27132c93ad9bb6a3ed7038bfcb91557b6fa8996 100644 (file)
--- 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 3a49ca852355c751d43ceef1a4f4450e9fb13c19..3a40b1a729153d4d687f1dd0cdaaa32f4b809f2a 100644 (file)
--- 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;
       }
 }