From cc32742c0915ada0393dfc9986354b7fe24b9b5e Mon Sep 17 00:00:00 2001 From: paco Date: Wed, 13 Jun 2018 13:08:58 +0200 Subject: [PATCH] bgpd: null check (Coverity 1399270) Signed-off-by: F. Aragon --- bgpd/bgpd.c | 6 +++--- bgpd/bgpd.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 5d858ae14f..48c27c1d61 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -102,6 +102,7 @@ struct community_list_handler *bgp_clist; unsigned int multipath_num = MULTIPATH_NUM; static void bgp_if_finish(struct bgp *bgp); +static void peer_drop_dynamic_neighbor(struct peer *peer); extern struct zclient *zclient; @@ -3718,10 +3719,10 @@ struct peer *peer_lookup_dynamic_neighbor(struct bgp *bgp, union sockunion *su) return peer; } -void peer_drop_dynamic_neighbor(struct peer *peer) +static void peer_drop_dynamic_neighbor(struct peer *peer) { int dncount = -1; - if (peer->group && peer->group->bgp) { + if (peer->group->bgp) { dncount = peer->group->bgp->dynamic_neighbors_count; if (dncount) peer->group->bgp->dynamic_neighbors_count = --dncount; @@ -3731,7 +3732,6 @@ void peer_drop_dynamic_neighbor(struct peer *peer) peer->group->name, dncount); } - /* If peer is configured at least one address family return 1. */ int peer_active(struct peer *peer) { diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 24d05c2e80..33d65bcb0f 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -1462,7 +1462,6 @@ extern struct peer_group *peer_group_lookup_dynamic_neighbor(struct bgp *, struct prefix **); extern struct peer *peer_lookup_dynamic_neighbor(struct bgp *, union sockunion *); -extern void peer_drop_dynamic_neighbor(struct peer *); /* * Peers are incredibly easy to memory leak -- 2.39.5