BGPD crash around bgp_config_write ()

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
Ticket: CM-9255

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index dbecd599aa35ea497a5d72371dc5ec3650e66d1a..802a8fddca18cdaceff305e1fa82572c8a34bf23 100644 (file)
--- 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",