From ad695d6e8de391ba6110d29744dd631229dd2478 Mon Sep 17 00:00:00 2001 From: Daniel Walton Date: Thu, 11 Feb 2016 17:28:11 +0000 Subject: [PATCH] BGPD crash around bgp_config_write () Signed-off-by: Daniel Walton Reviewed-by: Donald Sharp Ticket: CM-9255 --- bgpd/bgpd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index dbecd599aa..802a8fddca 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6660,23 +6660,23 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, else { if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) && - peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) && + (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY)) && !peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY) && - peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY)) + (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY))) { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s send-community both%s", addr, VTY_NEWLINE); } else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY) && - peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY)) + (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY))) { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s send-community extended%s", addr, VTY_NEWLINE); } else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) && - peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY)) + (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY))) { afi_header_vty_out (vty, afi, safi, write, " no neighbor %s send-community%s", -- 2.39.5