From bf6d507bb2c4a353461cca9706da764ab1c246d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Janouch?= <p.janouch@gmail.com>
Date: Mon, 8 Jan 2018 21:46:35 +0100
Subject: [PATCH] degesch: fix IPv6:port in irc_split_host_port()

---
 degesch.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/degesch.c b/degesch.c
index 841bea3..ad4c33e 100644
--- a/degesch.c
+++ b/degesch.c
@@ -5642,25 +5642,27 @@ irc_finish_connection (struct server *s, int socket, const char *hostname)
 	refresh_prompt (s->ctx);
 }
 
+/// Unwrap IPv6 addresses in format_host_port_pair() format
 static void
 irc_split_host_port (char *s, char **host, char **port)
 {
-	// FIXME: this won't work if this is an IPv6 address w/o a port
-	char *colon = strrchr (s, ':');
+	*host = s;
+	*port = "6667";
+
+	char *right_bracket = strchr (s, ']');
+	if (s[0] == '[' && right_bracket)
+	{
+		*right_bracket = '\0';
+		*host = s + 1;
+		s = right_bracket + 1;
+	}
+
+	char *colon = strchr (s, ':');
 	if (colon)
 	{
 		*colon = '\0';
-		*port = ++colon;
+		*port = colon + 1;
 	}
-	else
-		*port = "6667";
-
-	// Unwrap IPv6 addresses in format_host_port_pair() format
-	size_t host_end = strlen (s) - 1;
-	if (*s == '[' && s[host_end] == ']')
-		s++[host_end] = '\0';
-
-	*host = s;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -