Revert "bgpd: fix memory leak in dampening"

This reverts commit 322e1085fe52540261864bd73a3ecdb37f7203d3.

diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 6d2dc1a65a54a8193c81fd2bebbebf0cb4e9bcb8..dd9de5dc99e57708ba8765e098dc0bb54dc510a8 100644 (file)
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -388,13 +388,16 @@ void bgp_damp_info_free(struct bgp_damp_info *bdi, int withdraw)
 {
        assert(bdi);
 
+       if (bdi->path == NULL) {
+               XFREE(MTYPE_BGP_DAMP_INFO, bdi);
+               return;
+       }
+
        bdi->path->extra->damp_info = NULL;
        bgp_path_info_unset_flag(bdi->dest, bdi->path,
                                 BGP_PATH_HISTORY | BGP_PATH_DAMPED);
        if (bdi->lastrecord == BGP_RECORD_WITHDRAW && withdraw)
                bgp_path_info_delete(bdi->dest, bdi->path);
-
-       XFREE(MTYPE_BGP_DAMP_INFO, bdi);
 }
 
 static void bgp_damp_parameter_set(int hlife, int reuse, int sup, int maxsup,