X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/96af276d576750495ff35b4a7bc38e8e4703b960..17524941e736ac560d59db21eca1d6c08bb7ed4c:/windows/window.c

diff --git a/windows/window.c b/windows/window.c
index b2a5c5cb..f1f72525 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -2197,8 +2197,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		reconfig_result =
 		    do_reconfig(hwnd, back ? back->cfg_info(backhandle) : 0);
 		reconfiguring = FALSE;
-		if (!reconfig_result)
+		if (!reconfig_result) {
+                    conf_free(prev_conf);
 		    break;
+                }
 
 		conf_cache_data();
 
@@ -4803,7 +4805,7 @@ void palette_set(void *frontend, int n, int r, int g, int b)
 {
     if (n >= 16)
 	n += 256 - 16;
-    if (n > NALLCOLOURS)
+    if (n >= NALLCOLOURS)
 	return;
     real_palette_set(n, r, g, b);
     if (pal) {
@@ -4903,10 +4905,17 @@ void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_des
 	    GlobalFree(clipdata2);
 	return;
     }
-    if (!(lock = GlobalLock(clipdata)))
+    if (!(lock = GlobalLock(clipdata))) {
+        GlobalFree(clipdata);
+        GlobalFree(clipdata2);
 	return;
-    if (!(lock2 = GlobalLock(clipdata2)))
+    }
+    if (!(lock2 = GlobalLock(clipdata2))) {
+        GlobalUnlock(clipdata);
+        GlobalFree(clipdata);
+        GlobalFree(clipdata2);
 	return;
+    }
 
     memcpy(lock, data, len * sizeof(wchar_t));
     WideCharToMultiByte(CP_ACP, 0, data, len, lock2, len2, NULL, NULL);