proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 12:49:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6035 from qlyoung/fix-nexthop-label-nullity-before-free

Browse Source 
lib: remove null check before free nh_labels
This commit is contained in:
Santosh P K 2020-03-24 21:29:06 +05:30 committed by GitHub
commit aa50bf0618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nexthop.c
View File

@ -415,10 +415,8 @@ void nexthop_add_labels(struct nexthop *nexthop, enum lsp_types_t type,
/* Free label information of nexthop, if present. */ /* Free label information of nexthop, if present. */
void nexthop_del_labels(struct nexthop *nexthop) void nexthop_del_labels(struct nexthop *nexthop)
{ {
if (nexthop->nh_label) { XFREE(MTYPE_NH_LABEL, nexthop->nh_label);
XFREE(MTYPE_NH_LABEL, nexthop->nh_label); nexthop->nh_label_type = ZEBRA_LSP_NONE;
nexthop->nh_label_type = ZEBRA_LSP_NONE;
}
} }
const char *nexthop2str(const struct nexthop *nexthop, char *str, int size) const char *nexthop2str(const struct nexthop *nexthop, char *str, int size)