diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 813e59e..d920045 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -597,8 +597,6 @@
 static int
 bgp_connect_success (struct peer *peer)
 {
-  char buf1[BUFSIZ];
-
   if (peer->fd < 0)
     {
       zlog_err ("bgp_connect_success peer's fd is negative value %d",
@@ -612,6 +610,8 @@
 
   if (BGP_DEBUG (normal, NORMAL))
     {
+      char buf1[SU_ADDRSTRLEN];
+
       if (! CHECK_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER))
 	zlog_debug ("%s open active, local address %s", peer->host,
 		    sockunion2str (peer->su_local, buf1, SU_ADDRSTRLEN));
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index a7dca53..73234fe 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -185,7 +185,7 @@
     zlog_debug ("[Event] Make dummy peer structure until read Open packet");
 
   {
-    char buf[SU_ADDRSTRLEN + 1];
+    char buf[SU_ADDRSTRLEN];
 
     peer = peer_create_accept (peer1->bgp);
     SET_FLAG (peer->sflags, PEER_STATUS_ACCEPT_PEER);