From 3dab59cec1162ac56b6eadcac92bf3e68f6d3419 Mon Sep 17 00:00:00 2001
From: Bill Nokes <bill.nokes@reactivemarkets.com>
Date: Tue, 3 Mar 2026 07:05:45 +0000
Subject: [PATCH] fix(toolbox): Correctly print unix sockets with no path

Correctly print unix sockets with no path.

SDB-10742
---
 toolbox/net/Endpoint.hpp    | 12 +++++++++---
 toolbox/net/Endpoint.ut.cpp | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/toolbox/net/Endpoint.hpp b/toolbox/net/Endpoint.hpp
index 5d177154e..cb7fe2f8f 100644
--- a/toolbox/net/Endpoint.hpp
+++ b/toolbox/net/Endpoint.hpp
@@ -70,11 +70,17 @@ template <typename StreamT, typename T>
 StreamT& print_unix_endpoint(StreamT& os, const T& ep)
 {
     constexpr const char* scheme = "unix://";
-    // abstract unix socket's path starts with '\0' and not null-terminated
+    const size_t family_size = sizeof(std::declval<sockaddr_un>().sun_family);
+    if (ep.size() <= family_size) {
+        // No path
+        os << scheme;
+        return os;
+    }
     const auto* path = reinterpret_cast<const sockaddr_un*>(ep.data())->sun_path;
     if (path[0] == '\0') {
-        size_t size = ep.size() - sizeof(std::declval<sockaddr_un>().sun_family) - 1;
-        os << scheme << '|' << std::string_view{path + 1, size};
+        // abstract unix socket's path starts with '\0' and not null-terminated
+        const size_t path_size = ep.size() - family_size;
+        os << scheme << '|' << std::string_view{path + 1, path_size - 1};
         return os;
     }
     os << scheme << *ep.data();
diff --git a/toolbox/net/Endpoint.ut.cpp b/toolbox/net/Endpoint.ut.cpp
index 4e2e599e2..cc1339a77 100644
--- a/toolbox/net/Endpoint.ut.cpp
+++ b/toolbox/net/Endpoint.ut.cpp
@@ -179,6 +179,28 @@ BOOST_AUTO_TEST_CASE(ParseStreamUnixAbstractCase)
     BOOST_CHECK_EQUAL(to_string(ep), uri);
 }
 
+BOOST_AUTO_TEST_CASE(ParseStreamUnixAbstractEmptyCase)
+{
+    const auto uri = "unix://|"s;
+    const auto ep = parse_stream_endpoint(uri);
+    BOOST_CHECK_EQUAL(ep.protocol().family(), AF_UNIX);
+    BOOST_CHECK_EQUAL(ep.protocol().type(), SOCK_STREAM);
+    BOOST_CHECK_EQUAL(ep.protocol().protocol(), 0);
+    BOOST_CHECK_EQUAL(to_string(ep), uri);
+}
+
+BOOST_AUTO_TEST_CASE(ParseStreamUnixEmptyCase)
+{
+    auto sock = os::socket(net::UnixStreamProtocol{});
+    StreamEndpoint ep;
+    get_sock_name(sock.get(), ep);
+
+    BOOST_CHECK_EQUAL(ep.protocol().family(), AF_UNIX);
+    BOOST_CHECK_EQUAL(ep.protocol().type(), SOCK_STREAM);
+    BOOST_CHECK_EQUAL(ep.protocol().protocol(), 0);
+    BOOST_CHECK_EQUAL(to_string(ep), "unix://");
+}
+
 BOOST_AUTO_TEST_CASE(ParseStreamBindCase)
 {
     const auto ep = parse_stream_endpoint("tcp4://:80");