From: Renato Westphal <renato@opensourcerouting.org>
Date: Mon, 5 Dec 2016 20:19:47 +0000 (-0200)
Subject: zebra: fix segfault on "show mpls table"
X-Git-Tag: frr-3.0-branchpoint~126
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=76c764377c134c9d27508797231fc8873921b2db;p=matthieu%2Ffrr.git

zebra: fix segfault on "show mpls table"

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

diff --git a/zebra/zebra_mpls_vty.c b/zebra/zebra_mpls_vty.c
index ee7276f315..0185b555f2 100644
--- a/zebra/zebra_mpls_vty.c
+++ b/zebra/zebra_mpls_vty.c
@@ -789,10 +789,10 @@ DEFUN (show_mpls_table,
        JSON_STR)
 {
   struct zebra_vrf *zvrf;
-  u_char use_json = (argv[3]->arg != NULL);
+  u_char uj = use_json (argc, argv);
 
   zvrf = vrf_info_lookup(VRF_DEFAULT);
-  zebra_mpls_print_lsp_table(vty, zvrf, use_json);
+  zebra_mpls_print_lsp_table(vty, zvrf, uj);
   return CMD_SUCCESS;
 }
 
@@ -807,11 +807,11 @@ DEFUN (show_mpls_table_lsp,
 {
   u_int32_t label;
   struct zebra_vrf *zvrf;
-  u_char use_json = (argv[4]->arg != NULL);
+  u_char uj = use_json (argc, argv);
 
   zvrf = vrf_info_lookup(VRF_DEFAULT);
   label = atoi(argv[3]->arg);
-  zebra_mpls_print_lsp (vty, zvrf, label, use_json);
+  zebra_mpls_print_lsp (vty, zvrf, label, uj);
   return CMD_SUCCESS;
 }