From: Donatas Abraitis <donatas.abraitis@gmail.com>
Date: Fri, 30 Jul 2021 13:50:37 +0000 (+0300)
Subject: Revert "bgpd: fix memory leak in dampening"
X-Git-Tag: base_8.1~251^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F9243%2Fhead;p=mirror%2Ffrr.git

Revert "bgpd: fix memory leak in dampening"

This reverts commit 322e1085fe52540261864bd73a3ecdb37f7203d3.
---

diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 6d2dc1a65a..dd9de5dc99 100644
--- 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,