From 67043ea8687ed689183af9c98f0c347e459fb805 Mon Sep 17 00:00:00 2001 From: ylavic Date: Wed, 12 Jan 2022 12:48:03 +0000 Subject: Merge r1896956 from trunk: apr_sockaddr_ip_getbuf: Follow up to r1883728. Return APR_ENOSPC if returned buf is truncated for an AF_UNIX. Submitted by: ylavic git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1896958 13f79535-47bb-0310-9956-ffa450edef68 --- network_io/unix/sockaddr.c | 7 ++++--- 1 file 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 -- cgit v1.2.1