Commit Diff

Commit:
d7bf023b2f2d41cb6983bb3ce2c6d1bf049150b3
From:
Hiltjo Posthuma <hiltjo@codemadness.org>
Date:
Message:
fix memory leak in xloadcols() reported by Avi Halachmi (:avih)" <avihpit@yahoo.com> patch slightly changed by me.
Actions:
Patch | Tree
commit - b4d68d4daa2716c0064605a2a92082a7287ee54a
commit + d7bf023b2f2d41cb6983bb3ce2c6d1bf049150b3
blob - 00cb6b18658a3c7864da76e850d2a8cf4009b84d
blob + 042242181ecb2ca3e8efb82be3f9dd94968d78aa
--- x.c
+++ x.c
@@ -733,12 +733,12 @@ xloadcols(void)
 	static int loaded;
 	Color *cp;
 
-	dc.collen = MAX(LEN(colorname), 256);
-	dc.col = xmalloc(dc.collen * sizeof(Color));
-
 	if (loaded) {
 		for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
 			XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
+	} else {
+		dc.collen = MAX(LEN(colorname), 256);
+		dc.col = xmalloc(dc.collen * sizeof(Color));
 	}
 
 	for (i = 0; i < dc.collen; i++)