From 6498b758e9db4d2ec0660d6ae263ed429c136dea Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 4 May 2023 12:53:42 -0400 Subject: [PATCH] ospfd: Fix memory leaks w/ `show ip ospf int X json` commands FRR has a memory leak in the case when int X does not exist and a memory leak when int X does exist. Fix these Fixes: #13434 Signed-off-by: Donald Sharp (cherry picked from commit 74e21732db129f7287d5ab227e45f305c5dbf34e) --- ospfd/ospf_vty.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index b9f154ad03..ed3d09b1bd 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -3945,16 +3945,15 @@ static int show_ip_ospf_interface_common(struct vty *vty, struct ospf *ospf, /* Interface name is specified. */ ifp = if_lookup_by_name(intf_name, ospf->vrf_id); if (ifp == NULL) { - if (use_json) + if (use_json) { json_object_boolean_true_add(json_vrf, "noSuchIface"); - else + json_object_free(json_interface); + } else vty_out(vty, "No such interface name\n"); } else { - if (use_json) { + if (use_json) json_interface_sub = json_object_new_object(); - json_interface = json_object_new_object(); - } show_ip_ospf_interface_sub( vty, ospf, ifp, json_interface_sub, use_json); -- 2.39.5