proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 17:32:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5731 from chiragshah6/mdev

Browse Source 
bgpd: fix memory leak in evpn json outpus II
This commit is contained in:
Russ White 2020-01-28 10:06:03 -05:00 committed by GitHub
commit f96ed15ba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bgpd/bgp_evpn_vty.c
View File

@ -687,14 +687,22 @@ static void show_esi_routes(struct bgp *bgp,
add_prefix_to_json = 1; add_prefix_to_json = 1;
} }
if (json && add_prefix_to_json) { if (json) {
if (add_prefix_to_json) {
json_object_string_add(json_prefix, "prefix", json_object_string_add(json_prefix, "prefix",
prefix_str); prefix_str);
json_object_int_add(json_prefix, "prefixLen", json_object_int_add(json_prefix, "prefixLen",
rn->p.prefixlen); rn->p.prefixlen);
json_object_object_add(json_prefix, "paths", json_object_object_add(json_prefix, "paths",
json_paths); json_paths);
json_object_object_add(json, prefix_str, json_prefix); json_object_object_add(json, prefix_str,
json_prefix);
} else {
json_object_free(json_paths);
json_object_free(json_prefix);
json_paths = NULL;
json_prefix = NULL;
}
} }
} }
@ -786,14 +794,22 @@ static void show_vni_routes(struct bgp *bgp, struct bgpevpn *vpn, int type,
add_prefix_to_json = 1; add_prefix_to_json = 1;
} }
if (json && add_prefix_to_json) { if (json) {
if (add_prefix_to_json) {
json_object_string_add(json_prefix, "prefix", json_object_string_add(json_prefix, "prefix",
prefix_str); prefix_str);
json_object_int_add(json_prefix, "prefixLen", json_object_int_add(json_prefix, "prefixLen",
rn->p.prefixlen); rn->p.prefixlen);
json_object_object_add(json_prefix, "paths", json_object_object_add(json_prefix, "paths",
json_paths); json_paths);
json_object_object_add(json, prefix_str, json_prefix); json_object_object_add(json, prefix_str,
json_prefix);
} else {
json_object_free(json_paths);
json_object_free(json_prefix);
json_paths = NULL;
json_prefix = NULL;
}
} }
} }