summaryrefslogtreecommitdiffstats
path: root/tests
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 /tests
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 'tests')
-rw-r--r--tests/bgp_mpath_test.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c
index af62308b8..bafbef75f 100644
--- 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;
}