From: Mitesh Kanjariya <mitesh@marvel-07.cumulusnetworks.com>
Date: Thu, 29 Jun 2017 21:16:49 +0000 (-0700)
Subject: bgpd: fix crash while configuring rt
X-Git-Tag: frr-4.0-dev~431^2~18
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5bc2ed52f0b55615a24d788e9529ddb630fd9bc8;p=matthieu%2Ffrr.git

bgpd: fix crash while configuring rt

Ticket: CM-16410
Review: CCR-6409
Unit-test: Manual

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index be88fcd273..886d2a02c6 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -2563,11 +2563,11 @@ DEFUN (bgp_evpn_vni_rt,
 	if (rt_type == RT_TYPE_BOTH || rt_type == RT_TYPE_IMPORT) {
 		ecomadd = ecommunity_str2com(argv[2]->arg,
 					     ECOMMUNITY_ROUTE_TARGET, 0);
-		ecommunity_str(ecomadd);
 		if (!ecomadd) {
 			vty_out(vty, "%% Malformed Route Target list\n");
 			return CMD_WARNING;
 		}
+		ecommunity_str(ecomadd);
 
 		/* Do nothing if we already have this import route-target */
 		if (!bgp_evpn_rt_matches_existing(vpn->import_rtl, ecomadd))
@@ -2578,11 +2578,11 @@ DEFUN (bgp_evpn_vni_rt,
 	if (rt_type == RT_TYPE_BOTH || rt_type == RT_TYPE_EXPORT) {
 		ecomadd = ecommunity_str2com(argv[2]->arg,
 					     ECOMMUNITY_ROUTE_TARGET, 0);
-		ecommunity_str(ecomadd);
 		if (!ecomadd) {
 			vty_out(vty, "%% Malformed Route Target list\n");
 			return CMD_WARNING;
 		}
+		ecommunity_str(ecomadd);
 
 		/* Do nothing if we already have this export route-target */
 		if (!bgp_evpn_rt_matches_existing(vpn->export_rtl, ecomadd))
@@ -2645,11 +2645,11 @@ DEFUN (no_bgp_evpn_vni_rt,
 	}
 
 	ecomdel = ecommunity_str2com(argv[3]->arg, ECOMMUNITY_ROUTE_TARGET, 0);
-	ecommunity_str(ecomdel);
 	if (!ecomdel) {
 		vty_out(vty, "%% Malformed Route Target list\n");
 		return CMD_WARNING;
 	}
+	ecommunity_str(ecomdel);
 
 	if (rt_type == RT_TYPE_IMPORT) {
 		if (!bgp_evpn_rt_matches_existing(vpn->import_rtl, ecomdel)) {