diff options
| author | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2022-01-12 12:36:15 +0000 |
|---|---|---|
| committer | ylavic <ylavic@13f79535-47bb-0310-9956-ffa450edef68> | 2022-01-12 12:36:15 +0000 |
| commit | dc81a1115b404250ac6866aa725a116bc381662d (patch) | |
| tree | abdb8e678a07e45fa02ebab9f38f8cc9fff52062 | |
| parent | c85ea84ae8a4a9ed3a933637d01bec2e4b3ee8f6 (diff) | |
| download | libapr-dc81a1115b404250ac6866aa725a116bc381662d.tar.gz | |
apr_sockaddr_ip_getbuf: Follow up to r1883728.
Return APR_ENOSPC if returned buf is truncated for an AF_UNIX.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1896956 13f79535-47bb-0310-9956-ffa450edef68
| -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 5cee61933..16712fec2 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -110,9 +110,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 |