From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Tue, 5 Apr 2022 08:12:22 +0000 (+0300)
Subject: bgpd: No need to check for NULL before calling XFREE() in RPKI code
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=40e85d8a1552810b432769195c6212d4d1ca8c68;p=mirror%2Ffrr.git

bgpd: No need to check for NULL before calling XFREE() in RPKI code

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit c41a3cc5289f23d2aa70b5a9d8ddb7ebe408c54f)
---

diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index 54e125392f..468f55709c 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -904,9 +904,8 @@ static void free_cache(struct cache *cache)
 	if (cache->type == TCP) {
 		XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.tcp_config->host);
 		XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.tcp_config->port);
-		if (cache->tr_config.tcp_config->bindaddr)
-			XFREE(MTYPE_BGP_RPKI_CACHE,
-			      cache->tr_config.tcp_config->bindaddr);
+		XFREE(MTYPE_BGP_RPKI_CACHE,
+		      cache->tr_config.tcp_config->bindaddr);
 		XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.tcp_config);
 	}
 #if defined(FOUND_SSH)
@@ -918,9 +917,8 @@ static void free_cache(struct cache *cache)
 		      cache->tr_config.ssh_config->client_privkey_path);
 		XFREE(MTYPE_BGP_RPKI_CACHE,
 		      cache->tr_config.ssh_config->server_hostkey_path);
-		if (cache->tr_config.ssh_config->bindaddr)
-			XFREE(MTYPE_BGP_RPKI_CACHE,
-			      cache->tr_config.ssh_config->bindaddr);
+		XFREE(MTYPE_BGP_RPKI_CACHE,
+		      cache->tr_config.ssh_config->bindaddr);
 		XFREE(MTYPE_BGP_RPKI_CACHE, cache->tr_config.ssh_config);
 	}
 #endif