From: Renato Westphal <renato@opensourcerouting.org>
Date: Mon, 24 Jul 2017 22:48:08 +0000 (-0300)
Subject: ldpd: fix segfault in "clear mpls ldp neighbor [addr]"
X-Git-Tag: frr-4.0-dev~479^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=dbaaa5396c554d08ad839b9ed41de3d9951b5add;p=mirror%2Ffrr.git

ldpd: fix segfault in "clear mpls ldp neighbor [addr]"

Bug introduced by the CLI refactoring (c740f7d3678).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/ldpd/ldp_vty_cmds.c b/ldpd/ldp_vty_cmds.c
index 871905aa8f..8a8d903a61 100644
--- a/ldpd/ldp_vty_cmds.c
+++ b/ldpd/ldp_vty_cmds.c
@@ -759,8 +759,9 @@ DEFUN  (ldp_clear_mpls_ldp_neighbor,
 	int		 idx = 0;
 	const char	*address = NULL;
 
-	if (argv_find(argv, argc, "neighbor", &idx))
-		address = argv[idx + 1]->arg;
+	if (argv_find(argv, argc, "A.B.C.D", &idx) ||
+	    argv_find(argv, argc, "X:X::X:X", &idx))
+		address = argv[idx]->arg;
 
 	return (ldp_vty_clear_nbr(vty, address));
 }