From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 19 Nov 2014 10:16:04 +0000 (+0100)
Subject: Protect IPv6 address strings with []
X-Git-Tag: v1.3.90~5^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07cd2298dcbf7da8db22d630cb84c0216da30ea1;p=tigervnc.git

Protect IPv6 address strings with []

This is the format we support when converting a string to an
address, so it makes sense to use them the other way around.
---

diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx
index bbc41580..dd028600 100644
--- a/common/network/TcpSocket.cxx
+++ b/common/network/TcpSocket.cxx
@@ -249,17 +249,21 @@ char* TcpSocket::getPeerAddress() {
 
 #if defined(HAVE_GETADDRINFO) && defined(HAVE_INET_PTON)
   if (sa.u.sa.sa_family == AF_INET6) {
-    char buffer[INET6_ADDRSTRLEN];
+    char buffer[INET6_ADDRSTRLEN + 2];
     const char *name;
 
+    buffer[0] = '[';
+
     name = inet_ntop(sa.u.sa.sa_family, &sa.u.sin6.sin6_addr,
-                     buffer + 1, sizeof(buffer));
+                     buffer + 1, sizeof(buffer) - 2);
     if (name == NULL) {
       vlog.error("unable to convert peer name to a string");
       return rfb::strDup("");
     }
 
-    return rfb::strDup(name);
+    strcat(buffer, "]");
+
+    return rfb::strDup(buffer);
   }
 #endif