diff options
| -rw-r--r-- | network_io/unix/sockaddr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index 487e2ab99..a31867dc4 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -120,9 +120,10 @@ APR_DECLARE(apr_status_t) apr_sockaddr_ip_getbuf(char *buf, apr_size_t buflen, { #if APR_HAVE_SOCKADDR_UN if (sockaddr->family == APR_UNIX) { - apr_size_t len = (apr_size_t)sockaddr->ipaddr_len; - apr_cpystrn(buf, sockaddr->ipaddr_ptr, buflen < len ? buflen : len); - return APR_SUCCESS; + const char *ptr = sockaddr->ipaddr_ptr; + apr_size_t len = apr_cpystrn(buf, ptr, buflen) - buf; + /* assumes that sockaddr->ipaddr_ptr is nul terminated */ + return ptr[len] ? APR_ENOSPC : APR_SUCCESS; } #endif |