bgpd: Check to ensure community attributes exist before freeing them

Community attributes might have been removed by an inbound route map, so we
should check to ensure they still exist before trying to free them.
This fixes a segfault described in issue #6345.

Signed-off-by: Josh Cox <josh.cox@pureport.com>

diff --git a/bgpd/bgp_community.c b/bgpd/bgp_community.c
index 22d61f702d7c0c55dacbe76164766638202dd9b2..5a2f35f2c718d886ff11e3b9b0972e0e4b0add70 100644 (file)
--- a/bgpd/bgp_community.c
+++ b/bgpd/bgp_community.c
@@ -40,6 +40,9 @@ static struct community *community_new(void)
 /* Free communities value.  */
 void community_free(struct community **com)
 {
+       if (!(*com))
+               return;
+
        XFREE(MTYPE_COMMUNITY_VAL, (*com)->val);
        XFREE(MTYPE_COMMUNITY_STR, (*com)->str);
 

diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index b75676e86ebadb905b1c959e1d95898c95e450c3..f4ec09b8a1ffa7786dd0cdaffa1dde6096767fe9 100644 (file)
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -59,6 +59,9 @@ void ecommunity_strfree(char **s)
 /* Allocate ecommunities.  */
 void ecommunity_free(struct ecommunity **ecom)
 {
+       if (!(*ecom))
+               return;
+
        XFREE(MTYPE_ECOMMUNITY_VAL, (*ecom)->val);
        XFREE(MTYPE_ECOMMUNITY_STR, (*ecom)->str);
        XFREE(MTYPE_ECOMMUNITY, *ecom);

diff --git a/bgpd/bgp_lcommunity.c b/bgpd/bgp_lcommunity.c
index 8d99548fc2e11453fa0f3a133cbc584d0a91b92d..642888241ff4644fa202054232a3be6603dbb4ba 100644 (file)
--- a/bgpd/bgp_lcommunity.c
+++ b/bgpd/bgp_lcommunity.c
@@ -44,6 +44,9 @@ static struct lcommunity *lcommunity_new(void)
 /* Allocate lcommunities.  */
 void lcommunity_free(struct lcommunity **lcom)
 {
+       if (!(*lcom))
+               return;
+
        XFREE(MTYPE_LCOMMUNITY_VAL, (*lcom)->val);
        XFREE(MTYPE_LCOMMUNITY_STR, (*lcom)->str);
        XFREE(MTYPE_LCOMMUNITY, *lcom);