From: Ivana Hutarova Varekova <varekova@redhat.com>
Date: Wed, 30 Oct 2013 13:17:15 +0000 (+0100)
Subject: cgroup_{reload|init}_cached_templates:memory leaks
X-Git-Tag: v0.41~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe048b0dfe8990eda071ac14ad9575c0fc30eeaa;p=thirdparty%2Flibcgroup.git

cgroup_{reload|init}_cached_templates:memory leaks

cgroup_{reload|init}_cached_templates does not free memory if no template
is set. This patch fix the problem.

Signed-off-by: Ivana Hutarova Varekova <varekova@redhat.com>
Acked-by: Peter Schiffer <pschiffe@redhat.com>
---

diff --git a/src/config.c b/src/config.c
index ac844a7a..da2c0dd0 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1460,7 +1460,7 @@ int cgroup_reload_cached_templates(char *pathname)
 	}
 	template_table_index = 0;
 
-	if (config_template_table_index != 0) {
+	if ((config_template_table_index != 0) || (config_table_index != 0)) {
 		/* config template structures have to be free as well*/
 		cgroup_free_config();
 	}
@@ -1515,7 +1515,16 @@ int cgroup_init_templates_cache(char *pathname)
 	int ret = 0;
 	int i;
 
-	if (config_template_table_index != 0) {
+	if (template_table) {
+		/* template structures have to be free */
+		for (i = 0; i < template_table_index; i++)
+			cgroup_free_controllers(&template_table[i]);
+		free(template_table);
+		template_table = NULL;
+	}
+	template_table_index = 0;
+
+	if ((config_template_table_index != 0) || (config_table_index != 0)) {
 		/* config structures have to be clean */
 		cgroup_free_config();
 	}