X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/c50f9fde681e3dbeda57c89c34fce633e567901a..055817455466c8eb60392f30bb7c689763962e17:/windows/window.c

diff --git a/windows/window.c b/windows/window.c
index b0d7d5c2..17aaf1ae 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -542,9 +542,20 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	}
 
 	/*
-	 * Trim a colon suffix off the hostname if it's there.
+	 * 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.
 	 */
-	cfg.host[strcspn(cfg.host, ":")] = '\0';
+	{
+	    char *c = strchr(cfg.host, ':');
+
+	    if (c) {
+		char *d = strchr(c+1, ':');
+		if (!d)
+		    *c = '\0';
+	    }
+	}
 
 	/*
 	 * Remove any remaining whitespace from the hostname.
@@ -1900,7 +1911,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		GetWindowText(hwnd, cfg.wintitle, sizeof(cfg.wintitle));
 		prev_cfg = cfg;
 
-		if (!do_reconfig(hwnd))
+		if (!do_reconfig(hwnd, back ? back->cfg_info(backhandle) : 0))
 		    break;
 
 		{
@@ -2320,7 +2331,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		Rectangle(hdc, p.rcPaint.left, p.rcPaint.top, 
 			  p.rcPaint.right, p.rcPaint.bottom);
 
-		// SelectClipRgn(hdc, NULL);
+		/* SelectClipRgn(hdc, NULL); */
 
 		SelectObject(hdc, oldbrush);
 		DeleteObject(fillcolour);