bgpd: fix json object handling

Fix memory leaks when quitting early and double free when headers are
not set.

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
(cherry picked from commit 690c3134a4f5657bce8d533d8459c2e9e1dcfe86)

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 18272e10dc3fbe79cef3896f23e88a00b913cfee..2d6711c46df7942067af6d674aa9ac7d57b3e66c 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -13340,6 +13340,9 @@ static int peer_adj_routes(struct vty *vty, struct peer *peer, afi_t afi,
                                "No such neighbor or address family");
                        vty_out(vty, "%s\n", json_object_to_json_string(json));
                        json_object_free(json);
+                       json_object_free(json_ar);
+                       json_object_free(json_scode);
+                       json_object_free(json_ocode);
                } else
                        vty_out(vty, "%% No such neighbor or address family\n");
 
@@ -13356,6 +13359,9 @@ static int peer_adj_routes(struct vty *vty, struct peer *peer, afi_t afi,
                                "Inbound soft reconfiguration not enabled");
                        vty_out(vty, "%s\n", json_object_to_json_string(json));
                        json_object_free(json);
+                       json_object_free(json_ar);
+                       json_object_free(json_scode);
+                       json_object_free(json_ocode);
                } else
                        vty_out(vty,
                                "%% Inbound soft reconfiguration not enabled\n");
@@ -13424,14 +13430,17 @@ static int peer_adj_routes(struct vty *vty, struct peer *peer, afi_t afi,
                        json_object_to_json_string_ext(
                                json, JSON_C_TO_STRING_PRETTY));
 
-               if (!output_count && !filtered_count) {
+               /*
+                * These fields only give up ownership to `json` when `header1`
+                * is used (set to zero). See code in `show_adj_route` and
+                * `show_adj_route_header`.
+                */
+               if (header1 == 1) {
                        json_object_free(json_scode);
                        json_object_free(json_ocode);
                }
 
-               if (json)
-                       json_object_free(json);
-
+               json_object_free(json);
        } else if (output_count > 0) {
                if (filtered_count > 0)
                        vty_out(vty,