From: Tomasz Blaszczak <tomasz.blaszczak@consult.red>
Date: Wed, 23 Jun 2021 07:17:05 +0000 (+0200)
Subject: When an item is added to an array, then the array is realloc()ed (to size+1),
X-Git-Tag: lxc-5.0.0~151^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3877%2Fhead;p=thirdparty%2Flxc.git

When an item is added to an array, then the array is realloc()ed (to size+1),
and the item is copied (strdup()) to the array.
Thus, when an item is removed from an array, memory allocated for that item
should be freed, successive items should be left-shifted and the array
realloc()ed again (size-1).

Additional changes:
- If strdup() fails in add_to_array(), then an array should be
  realloc()ed again to original size.
- Initialize an array in list_all_containers().

Signed-off-by: Tomasz Blaszczak <tomasz.blaszczak@consult.red>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index c533d9dd4..96c3ee31b 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2326,7 +2326,7 @@ static bool remove_from_array(char ***names, char *cname, int size)
 		char **newnames = (char**)realloc(*names, (size-1) * sizeof(char *));
 		if (!newnames) {
 			ERROR("Out of memory");
-			return false;
+			return true;
 		}
 
 		*names = newnames;