From 4f61f954631d86255dab707a0b91b44b63fed06f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 15 Apr 2015 17:41:27 +1000
Subject: [PATCH] Resolve memory leaks on exit.

---
 spectrwm.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/spectrwm.c b/spectrwm.c
index 48591d9..1542fe1 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -1099,6 +1099,7 @@ void	 print_win_geom(xcb_window_t);
 #endif
 void	 propertynotify(xcb_property_notify_event_t *);
 void	 quirk_free(struct quirk *);
+void	 clear_quirks(void);
 void	 quirk_insert(const char *, const char *, const char *, uint32_t, int);
 void	 quirk_remove(struct quirk *);
 void	 quirk_replace(struct quirk *, const char *, const char *, const char *,
@@ -1158,6 +1159,7 @@ int	 spawn_expand(struct swm_region *, union arg *, const char *, char ***);
 void	 spawn_insert(const char *, const char *, int);
 struct spawn_prog	*spawn_find(const char *);
 void	 spawn_remove(struct spawn_prog *);
+void	 clear_spawns(void);
 void	 spawn_replace(struct spawn_prog *, const char *, const char *, int);
 void	 spawn_select(struct swm_region *, union arg *, const char *, int *);
 void	 stack_config(struct swm_region *, union arg *);
@@ -7121,6 +7123,16 @@ spawn_remove(struct spawn_prog *sp)
 	DNPRINTF(SWM_D_SPAWN, "spawn_remove: leave\n");
 }
 
+void
+clear_spawns(void)
+{
+	struct spawn_prog	*sp;
+
+	while ((sp = TAILQ_FIRST(&spawns)) != NULL) {
+		spawn_remove(sp);
+	}
+}
+
 struct spawn_prog*
 spawn_find(const char *name)
 {
@@ -7875,6 +7887,16 @@ quirk_free(struct quirk *qp)
 	free(qp);
 }
 
+void
+clear_quirks(void)
+{
+	struct quirk		*qp;
+
+	while ((qp = TAILQ_FIRST(&quirks)) != NULL) {
+		quirk_remove(qp);
+	}
+}
+
 void
 quirk_replace(struct quirk *qp, const char *class, const char *instance,
     const char *name, uint32_t quirk, int ws)
@@ -10764,10 +10786,16 @@ shutdown_cleanup(void)
 
 	cursors_cleanup();
 
+	clear_quirks();
+	clear_spawns();
+	clear_keys();
+
 	teardown_ewmh();
 
 	num_screens = get_screen_count();
 	for (i = 0; i < num_screens; ++i) {
+		int j;
+
 		xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
 		    screens[i].root, XCB_CURRENT_TIME);
 
@@ -10779,7 +10807,19 @@ shutdown_cleanup(void)
 			XftColorFree(display, DefaultVisual(display, i),
 			    DefaultColormap(display, i), &search_font_color);
 		}
+
+		for (j = 0; j < SWM_S_COLOR_MAX; ++j) {
+			free(screens[i].c[j].name);
+		}
+
+		for (j = 0; j < SWM_WS_MAX; ++j) {
+			free(screens[i].ws[j].name);
+		}
 	}
+	free(screens);
+
+	free(bar_format);
+	free(clock_format);
 
 	if (bar_font_legacy)
 		XFreeFontSet(display, bar_fs);
-- 
2.39.2