From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 25 Sep 2013 20:01:54 +0000 (-0500)
Subject: fix up a few snafu's in forward-port of last commit
X-Git-Tag: lxc-1.0.0.alpha2~93
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cdafc545ccd84120f508246322683ea4dba7f9f;p=thirdparty%2Flxc.git

fix up a few snafu's in forward-port of last commit

Make sure to free line.

Don't free 'info' when freeing base_info will later free info.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index 730d3b7d6..abdd95408 100644
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -400,6 +400,7 @@ out:
 	fclose(proc_self_mountinfo);
 	process_unlock();
 	free(tokens);
+	free(line);
 	return bret;
 }
 
@@ -1123,7 +1124,6 @@ char *lxc_cgroup_get_hierarchy_abs_path(const char *subsystem, const char *name,
 	}
 	result = cgroup_to_absolute_path(mp, info->cgroup_path, NULL);
 out3:
-	lxc_cgroup_process_info_free(info);
 out2:
 	lxc_cgroup_process_info_free(base_info);
 out1: