mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-07-27 08:32:12 +00:00
Merge pull request #7563 from donaldsharp/why_not_cut_n_paste
ospf6d: More lists being leaked
This commit is contained in:
commit
e01396e1ea
@ -963,8 +963,6 @@ static uint8_t *ospfv3WwLsdbEntry(struct variable *v, oid *name, size_t *length,
|
|||||||
else if (v->magic & OSPFv3WWLINKTABLE) {
|
else if (v->magic & OSPFv3WWLINKTABLE) {
|
||||||
/* We build a sorted list of interfaces */
|
/* We build a sorted list of interfaces */
|
||||||
ifslist = list_new();
|
ifslist = list_new();
|
||||||
if (!ifslist)
|
|
||||||
return NULL;
|
|
||||||
ifslist->cmp = (int (*)(void *, void *))if_icmp_func;
|
ifslist->cmp = (int (*)(void *, void *))if_icmp_func;
|
||||||
FOR_ALL_INTERFACES (vrf, iif)
|
FOR_ALL_INTERFACES (vrf, iif)
|
||||||
listnode_add_sort(ifslist, iif);
|
listnode_add_sort(ifslist, iif);
|
||||||
@ -993,6 +991,7 @@ static uint8_t *ospfv3WwLsdbEntry(struct variable *v, oid *name, size_t *length,
|
|||||||
}
|
}
|
||||||
|
|
||||||
list_delete_all_node(ifslist);
|
list_delete_all_node(ifslist);
|
||||||
|
list_delete(&ifslist);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1100,8 +1099,6 @@ static uint8_t *ospfv3IfEntry(struct variable *v, oid *name, size_t *length,
|
|||||||
} else {
|
} else {
|
||||||
/* We build a sorted list of interfaces */
|
/* We build a sorted list of interfaces */
|
||||||
ifslist = list_new();
|
ifslist = list_new();
|
||||||
if (!ifslist)
|
|
||||||
return NULL;
|
|
||||||
ifslist->cmp = (int (*)(void *, void *))if_icmp_func;
|
ifslist->cmp = (int (*)(void *, void *))if_icmp_func;
|
||||||
FOR_ALL_INTERFACES (vrf, iif)
|
FOR_ALL_INTERFACES (vrf, iif)
|
||||||
listnode_add_sort(ifslist, iif);
|
listnode_add_sort(ifslist, iif);
|
||||||
@ -1121,6 +1118,7 @@ static uint8_t *ospfv3IfEntry(struct variable *v, oid *name, size_t *length,
|
|||||||
}
|
}
|
||||||
|
|
||||||
list_delete_all_node(ifslist);
|
list_delete_all_node(ifslist);
|
||||||
|
list_delete(&ifslist);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!oi)
|
if (!oi)
|
||||||
|
Loading…
Reference in New Issue
Block a user