Merge pull request #2673 from Blub/2018-10-06/cgfsng-alloc-cleanup

cgfsng: use realloc instead of malloc+copy+free

Merge pull request #2673 from Blub/2018-10-06/cgfsng-alloc-cleanup
13c45a4a · Christian Brauner · GitHub · 0a886c56 · 5407d095 · 13c45a4a
Unverified Commit 13c45a4a authored Oct 06, 2018 by Christian Brauner Committed by GitHub Oct 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

cgfsng.c src/lxc/cgroups/cgfsng.c +2 -3

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1377,10 +1377,9 @@ __cgfsng_ops static inline bool cgfsng_monitor_create(struct cgroup_ops *ops,
 		return bret;

 	len = strlen(tmp) + 5; /* leave room for -NNN\0 */
-	monitor_cgroup = must_alloc(len);
-	(void)strlcpy(monitor_cgroup, tmp, len);
-	free(tmp);
+	monitor_cgroup = must_realloc(tmp, len);
 	offset = monitor_cgroup + len - 5;
+	*offset = 0;

 	do {
 		if (idx) {