From: G. Paul Ziemba <paulz@labn.net>
Date: Sat, 14 Apr 2018 22:34:21 +0000 (-0700)
Subject: bgp/rfapi: fix rfapiNhlAddNodeRoutes SA issue
X-Git-Tag: frr-5.0-dev~54^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=84cc12071c403a529f82e05efab3631c9b014140;p=mirror_frr.git

bgp/rfapi: fix rfapiNhlAddNodeRoutes SA issue

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
---

diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index d5208f696..392c87867 100644
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -1543,10 +1543,15 @@ static int rfapiNhlAddNodeRoutes(
 	int count = 0;
 	int is_l2 = (rn->p.family == AF_ETHERNET);
 
-	if (rfapiRibFTDFilterRecentPrefix(
-		    (struct rfapi_descriptor *)(rfd_rib_node->table->info), rn,
-		    pfx_target_original)) {
-		return 0;
+	if (rfd_rib_node && rfd_rib_node->table && rfd_rib_node->table->info) {
+		struct rfapi_descriptor *rfd;
+
+		rfd = (struct rfapi_descriptor *)(rfd_rib_node->table->info);
+
+		if (rfapiRibFTDFilterRecentPrefix(
+			rfd, rn, pfx_target_original))
+
+			return 0;
 	}
 
 	seen_nexthops =