matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

bgpd: null check (Coverity 1453455)

Browse source 
Signed-off-by: F. Aragon <paco@voltanet.io>
This commit is contained in:
F. Aragon 2018-06-28 16:16:35 +02:00
parent 62a9c814e1
commit 0866cdaf3e
No known key found for this signature in database
GPG key ID: FD112A8C7E6A5E4A
2 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bgpd/bgpd.c
View file

@ -2733,9 +2733,8 @@ int peer_group_bind(struct bgp *bgp, union sockunion *su, struct peer *peer,
if (peer->group) { if (peer->group) {
assert(group && peer->group == group); assert(group && peer->group == group);
} else { } else {
struct listnode *pn; listnode_delete(bgp->peer, peer);
pn = listnode_lookup(bgp->peer, peer);
list_delete_node(bgp->peer, pn);
peer->group = group; peer->group = group;
listnode_add_sort(bgp->peer, peer); listnode_add_sort(bgp->peer, peer);

22
lib/linklist.c
View file

@ -186,26 +186,10 @@ void listnode_move_to_tail(struct list *l, struct listnode *n)
void listnode_delete(struct list *list, void *val) void listnode_delete(struct list *list, void *val)
{ {
struct listnode *node; struct listnode *node = listnode_lookup(list, val);
assert(list); if (node)
for (node = list->head; node; node = node->next) { list_delete_node(list, node);
if (node->data == val) {
if (node->prev)
node->prev->next = node->next;
else
list->head = node->next;
if (node->next)
node->next->prev = node->prev;
else
list->tail = node->prev;
list->count--;
listnode_free(node);
return;
}
}
} }
void *listnode_head(struct list *list) void *listnode_head(struct list *list)