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 730d3b7d637bfb811431de5df523bc663a164e09..abdd95408c56b80af016cd1a95c49b8b01d04d14 100644 (file)
--- 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: