summaryrefslogtreecommitdiffstats
path: root/bgpd
diff options
context:
space:
mode:
authorLou Berger <lberger@labn.net>2016-01-12 19:41:58 +0100
committervivek <vivek@cumulusnetworks.com>2016-06-09 06:49:47 +0200
commit005b6bc0ab626fa000d14e91d5177ef264372774 (patch)
tree0b18702f4452c4a984a8db78de09c77aeb4c4740 /bgpd
parentbgpd: Do not process workqueue upon instance delete (diff)
downloadfrr-005b6bc0ab626fa000d14e91d5177ef264372774.tar.xz
frr-005b6bc0ab626fa000d14e91d5177ef264372774.zip
bgpd: tests - add null pointer protection to fix bgp test failures
Signed-off-by: Lou Berger <lberger@labn.net> (cherry picked from commit d5d5e3e04fc41b9a89b7ce9049fd322bdbde2e4d) Conflicts: bgpd/bgp_nexthop.c
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_nexthop.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index d81c6a805..80495065b 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -148,6 +148,8 @@ bgp_address_init (struct bgp *bgp)
void
bgp_address_destroy (struct bgp *bgp)
{
+ if (bgp->address_hash == NULL)
+ return;
hash_clean(bgp->address_hash, NULL);
hash_free(bgp->address_hash);
bgp->address_hash = NULL;