]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: No need to check for NULL before calling XFREE() in RPKI code
authorDonatas Abraitis <donatas@opensourcerouting.org>
Tue, 5 Apr 2022 08:12:22 +0000 (11:12 +0300)
committermergify-bot <noreply@mergify.com>
Fri, 8 Apr 2022 11:59:49 +0000 (11:59 +0000)
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit c41a3cc5289f23d2aa70b5a9d8ddb7ebe408c54f)

bgpd/bgp_rpki.c

index 54e125392fb70a697cf307b305fe9242073e785f..468f55709c30852324119aa278339c5f66594c7e 100644 (file)
@@ -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