Reinstate a piece of code accidentally removed in r9214, where Windows

[PuTTY_svn.git] / windows / window.c

diff --git a/windows/window.c b/windows/window.c
index 0ae88cc10e7c963335592fc8655cc541813198f1..8d13ff911754f2abb0a545d7dc779200faea834a 100644 (file)
--- a/windows/window.c
+++ b/windows/window.c
@@ -617,10 +617,21 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
                }
            }
 
-           /*
-            * Trim off a colon suffix if it's there.
-            */
-           host[strcspn(host, ":")] = '\0';
+            /*
+             * Trim a colon suffix off the hostname if it's there. In
+             * order to protect IPv6 address literals against this
+             * treatment, we do not do this if there's _more_ than one
+             * colon.
+             */
+            {
+                char *c = strchr(host, ':');
+ 
+                if (c) {
+                    char *d = strchr(c+1, ':');
+                    if (!d)
+                        *c = '\0';
+                }
+            }
 
            /*
             * Remove any remaining whitespace.