Increased the final buffer size (in the info method) to accommodate the maximum possible string size. (ubuntu 20 - gcc 10 warning)

1 files changed, 11 insertions, 3 deletions

diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp
index 624e69cd82f..31cfe1db91f 100644
--- a/ACE/ace/Acceptor.cpp
+++ b/ACE/ace/Acceptor.cpp
@@ -830,7 +830,6 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
 {
   ACE_TRACE ("ACE_Strategy_Acceptor::info");
 
-  ACE_TCHAR buf[BUFSIZ];
   ACE_TCHAR service_addr_str[BUFSIZ];
   typename PEER_ACCEPTOR::PEER_ADDR addr;
 
@@ -840,8 +839,17 @@ ACE_Strategy_Acceptor<SVC_HANDLER, PEER_ACCEPTOR>::info (ACE_TCHAR **strp,
                                 sizeof service_addr_str) == -1)
     return -1;
 
-  // @@ Should add the protocol in...
-  ACE_OS::snprintf (buf, BUFSIZ,
+  //
+  // gcc10 complains that it is possible that buf could be truncated by up to
+  // 6 bytes in this call to snprintf.  Technically, this is possible
+  // (however unlikely that may be).  Since service_addr_str is defined to be
+  // of size BUFSIZ, gcc assumes that the string could actually be BUFSIZ in
+  // length.  That makes the possible total length of the combined string
+  // (given the size of the literal string constants) 5 + BUFSIZE + 1.
+  //
+  const size_t additional = 6;
+  ACE_TCHAR buf[BUFSIZ + additional];
+  ACE_OS::snprintf (buf, sizeof buf,
                     ACE_TEXT ("%s\t %s #%s\n"),
                     this->service_name_ == 0
                     ? ACE_TEXT ("<unknown>")