]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: fix crash in displaying json orf prefix-list 17817/head
authorLouis Scalbert <louis.scalbert@6wind.com>
Thu, 9 Jan 2025 17:28:53 +0000 (18:28 +0100)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Thu, 9 Jan 2025 20:58:58 +0000 (20:58 +0000)
bgpd crashes when there is several entries in the prefix-list. No
backtrace is provided because the issue was catched from a code review.

Fixes: 856ca177c4 ("Added json formating support to show-...-neighbors-... bgp commands.")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit 8ccf60921b85893d301186a0f8156fb702da379f)

lib/plist.c

index 40b3c8e498019d74702e4ba27e47be4f5d7d5a18..60c0bda443480467cd7a11914b1086b7456046b4 100644 (file)
@@ -1536,7 +1536,6 @@ int prefix_bgp_show_prefix_list(struct vty *vty, afi_t afi, char *name,
        if (use_json) {
                json = json_object_new_object();
                json_prefix = json_object_new_object();
-               json_list = json_object_new_object();
 
                json_object_int_add(json_prefix, "prefixListCounter",
                                    plist->count);
@@ -1544,6 +1543,8 @@ int prefix_bgp_show_prefix_list(struct vty *vty, afi_t afi, char *name,
                                       plist->name);
 
                for (pentry = plist->head; pentry; pentry = pentry->next) {
+                       json_list = json_object_new_object();
+
                        json_object_int_add(json_list, "seq", pentry->seq);
                        json_object_string_add(json_list, "seqPrefixListType",
                                               prefix_list_type_str(pentry));