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

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index d81c6a80521c82409613b8228bc0a9b97c826b5b..80495065b0db45aba5910daa9c19f37cd2dac96a 100644 (file)
--- 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;

diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c
index af62308b88f6b0a7945587ecc85c4d36441d225d..bafbef75fbcac2b048c5e9588b6aa5dd881c6921 100644 (file)
--- a/tests/bgp_mpath_test.c
+++ b/tests/bgp_mpath_test.c
@@ -387,7 +387,8 @@ global_test_init (void)
 static int
 global_test_cleanup (void)
 {
-  zclient_free (zclient);
+  if (zclient != NULL)
+    zclient_free (zclient);
   thread_master_free (master);
   return 0;
 }