diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-09-17 08:57:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 08:57:33 +0200 |
| commit | c9e357117805957910e7bfb9bcd533a3f962f7b8 (patch) | |
| tree | fd30ad39e54db4ba772a647087419705390868af /ACE/ace | |
| parent | ebf00c730e8c5255c201509130aeda6c42135f26 (diff) | |
| parent | b54bbdb8179ddfa5e66d1430c81998bffdc5ef95 (diff) | |
| download | ATCD-c9e357117805957910e7bfb9bcd533a3f962f7b8.tar.gz | |
Merge pull request #1674 from jwillemsen/jwi-strsncpy
Use strsncpy as that will return a zero terminated string, fixes gcc …
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/OS_NS_string.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/SOCK_Dgram.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ACE/ace/OS_NS_string.cpp b/ACE/ace/OS_NS_string.cpp index cbeda603bbf..223d753589a 100644 --- a/ACE/ace/OS_NS_string.cpp +++ b/ACE/ace/OS_NS_string.cpp @@ -83,9 +83,9 @@ ACE_OS::strerror (int errnum) if (ACE::is_sock_error (errnum)) { const ACE_TCHAR *errortext = ACE::sock_error (errnum); - ACE_OS::strncpy (ret_errortext, - ACE_TEXT_ALWAYS_CHAR (errortext), - sizeof (ret_errortext)); + ACE_OS::strsncpy (ret_errortext, + ACE_TEXT_ALWAYS_CHAR (errortext), + sizeof (ret_errortext)); return ret_errortext; } #if defined (ACE_LACKS_STRERROR) diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 32eb1121448..8c03e610fb0 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -720,8 +720,7 @@ ACE_SOCK_Dgram::make_multicast_ifaddr (ip_mreq *ret_mreq, ACE_HTONL (interface_addr.get_ip_address ()); #else ifreq if_address; - ACE_OS::strncpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if), (sizeof if_address.ifr_name) - 1); - if_address.ifr_name[(sizeof if_address.ifr_name) - 1] = '\0'; + ACE_OS::strsncpy (if_address.ifr_name, ACE_TEXT_ALWAYS_CHAR (net_if), (sizeof if_address.ifr_name)); if (ACE_OS::ioctl (this->get_handle (), SIOCGIFADDR, &if_address) == -1) |