From bab686d8c46f17cf4a1bf55939e576458c344481 Mon Sep 17 00:00:00 2001 From: "google@craigoakes.com" Date: Sun, 8 Feb 2015 22:34:42 +0000 Subject: [PATCH] Corrected memory leak introduced with r690 git-svn-id: http://tint2.googlecode.com/svn/trunk@691 121b4492-b84c-0410-8b4c-0d4edfb3f3cc --- src/config.c | 4 +++- src/panel.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/config.c b/src/config.c index 523e671..5008223 100644 --- a/src/config.c +++ b/src/config.c @@ -288,8 +288,10 @@ void add_entry (char *key, char *value) server.disable_transparency = atoi (value); } else if (strcmp (key, "panel_window_name") == 0) { - if (strlen(value) > 0) + if (strlen(value) > 0) { + free(panel_window_name); panel_window_name = strdup (value); + } } /* Battery */ diff --git a/src/panel.c b/src/panel.c index 7226e73..9cbabe2 100644 --- a/src/panel.c +++ b/src/panel.c @@ -53,7 +53,7 @@ int panel_position; int panel_horizontal; int panel_refresh; int task_dragged; -char *panel_window_name; +char *panel_window_name = NULL; int panel_autohide; int panel_autohide_show_timeout; @@ -90,7 +90,8 @@ void default_panel() panel_strut_policy = STRUT_FOLLOW_SIZE; panel_dock = 0; // default not in the dock panel_layer = BOTTOM_LAYER; // default is bottom layer - panel_window_name = "tint2"; + free(panel_window_name); + panel_window_name = strdup("tint2"); wm_menu = 0; max_tick_urgent = 14; mouse_left = TOGGLE_ICONIFY; @@ -124,6 +125,7 @@ void cleanup_panel() } if (panel_items_order) g_free(panel_items_order); + free(panel_window_name); if (panel1) free(panel1); if (backgrounds) g_array_free(backgrounds, 1);