Merge pull request #6240 from ton31337/fix/null_bnc_bgp_show_hostname

bgpd: Add a sanitify check for bgp_nexthop_cache against NULL
FRRouting · Apr 17, 2020 · bece779 · bece779
2 parents a83014c + eb91f8d
commit bece779
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -7544,7 +7544,7 @@ static char *bgp_nexthop_hostname(struct peer *peer,
 				  struct bgp_nexthop_cache *bnc)
 {
 	if (peer->hostname
-	    && CHECK_FLAG(peer->bgp->flags, BGP_FLAG_SHOW_HOSTNAME)
+	    && CHECK_FLAG(peer->bgp->flags, BGP_FLAG_SHOW_HOSTNAME) && bnc
 	    && CHECK_FLAG(bnc->flags, BGP_NEXTHOP_CONNECTED))
 		return peer->hostname;
 	return NULL;