From 775d591a684dad305041c505be0c3bff2adb4349 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 22 Jun 2009 01:50:15 +0200 Subject: [PATCH] fix a few memleaks --- src/conky.c | 4 +++- src/x11.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conky.c b/src/conky.c index 5f15692..6f7bde3 100644 --- a/src/conky.c +++ b/src/conky.c @@ -7416,7 +7416,6 @@ static void clean_up(void) XFlush(display); } - XFreeGC(display, window.gc); free_fonts(); } @@ -7650,6 +7649,8 @@ static void set_default_configurations(void) #endif /* X11 */ for (i = 0; i < MAX_TEMPLATES; i++) { + if (template[i]) + free(template[i]); template[i] = strdup(""); } @@ -8907,6 +8908,7 @@ int main(int argc, char **argv) g_signal_pending = 0; memset(&info, 0, sizeof(info)); + memset(template, 0, sizeof(template)); clear_net_stats(); #ifdef TCP_PORT_MONITOR diff --git a/src/x11.c b/src/x11.c index 5ee4446..6692694 100644 --- a/src/x11.c +++ b/src/x11.c @@ -216,6 +216,7 @@ void set_transparent_background(Window win) void destroy_window(void) { XDestroyWindow(display, window.window); + XFreeGC(display, window.gc); memset(&window, 0, sizeof(struct conky_window)); } -- 1.7.9.5