From: paco <paco@voltanet.io>
Date: Fri, 8 Jun 2018 16:49:36 +0000 (+0200)
Subject: zebra: resource leak fix (Coverity 1465679)
X-Git-Tag: frr-6.1-dev~354^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=77e03f051194095ea35a5a5559c35917fd9565f6;p=mirror%2Ffrr.git

zebra: resource leak fix (Coverity 1465679)

Signed-off-by: F. Aragon <paco@voltanet.io>
---

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index eb11941a3a..9ce8c74220 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -260,18 +260,22 @@ static int zebra_static_route_holdem(
 			return CMD_SUCCESS;
 		}
 
-		XFREE(MTYPE_STATIC_ROUTE, shr->nhvrf_name);
-		XFREE(MTYPE_STATIC_ROUTE, shr->vrf_name);
-		XFREE(MTYPE_STATIC_ROUTE, shr);
 		/*
 		 * If a person enters the same line again
 		 * we need to silently accept it
 		 */
-		return CMD_SUCCESS;
+		goto shr_cleanup;
 	}
 
-	if (!negate)
+	if (!negate) {
 		listnode_add_sort(static_list, shr);
+		return CMD_SUCCESS;
+	}
+
+shr_cleanup:
+	XFREE(MTYPE_STATIC_ROUTE, shr->nhvrf_name);
+	XFREE(MTYPE_STATIC_ROUTE, shr->vrf_name);
+	XFREE(MTYPE_STATIC_ROUTE, shr);
 
 	return CMD_SUCCESS;
 }