From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 12 Jun 2018 19:10:01 +0000 (-0400)
Subject: bgpd: Ensure that bgp_delete bgp pointer is non-null
X-Git-Tag: frr-6.1-dev~338^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2407%2Fhead;p=mirror%2Ffrr.git

bgpd: Ensure that bgp_delete bgp pointer is non-null

Crash w/ an assert if someone calls bgp_delete with a
NULL parameter as opposed to crashing when we dereference
the pointer a bit later.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 5d858ae14f..f8903ea568 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3300,6 +3300,7 @@ int bgp_delete(struct bgp *bgp)
 	afi_t afi;
 	int i;
 
+	assert(bgp);
 	THREAD_OFF(bgp->t_startup);
 
 	if (BGP_DEBUG(zebra, ZEBRA)) {