1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: LiFeng <lifeng68@huawei.com>
3 Date: Tue, 24 Apr 2018 15:10:15 -0400
4 Subject: [PATCH] Fix memory leak in list_active_containers
6 Signed-off-by: LiFeng <lifeng68@huawei.com>
8 src/lxc/lxccontainer.c | 25 +++++++++++++++++++++----
9 1 file changed, 21 insertions(+), 4 deletions(-)
11 diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
12 index 6d41b6cf..6a58d81c 100644
13 --- a/src/lxc/lxccontainer.c
14 +++ b/src/lxc/lxccontainer.c
15 @@ -4973,32 +4973,49 @@ int list_active_containers(const char *lxcpath, char ***nret,
16 char *recvpath = lxc_cmd_get_lxcpath(p);
19 - if (strncmp(lxcpath, recvpath, lxcpath_len) != 0)
20 + if (strncmp(lxcpath, recvpath, lxcpath_len) != 0) {
25 p = lxc_cmd_get_name(p);
30 - if (array_contains(&ct_name, p, ct_name_cnt))
31 + if (array_contains(&ct_name, p, ct_name_cnt)) {
37 - if (!add_to_array(&ct_name, p, ct_name_cnt))
38 + if (!add_to_array(&ct_name, p, ct_name_cnt)) {
53 c = lxc_container_new(p, lxcpath);
55 INFO("Container %s:%s is running but could not be loaded",
57 remove_from_array(&ct_name, p, ct_name_cnt--);
67 * If this is an anonymous container, then is_defined *can*
68 * return false. So we don't do that check. Count on the