From a64edc1c8d5b917180419b7b28a75f50217cbc2f Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Thu, 27 Jun 2019 14:25:53 +0200 Subject: [PATCH] cgroups: use __do_free Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 4cf67950a..bb0c90981 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -2754,7 +2754,7 @@ __cgfsng_ops static bool cgfsng_data_init(struct cgroup_ops *ops) struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf) { - struct cgroup_ops *cgfsng_ops; + __do_free struct cgroup_ops *cgfsng_ops = NULL; cgfsng_ops = malloc(sizeof(struct cgroup_ops)); if (!cgfsng_ops) @@ -2763,10 +2763,8 @@ struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf) memset(cgfsng_ops, 0, sizeof(struct cgroup_ops)); cgfsng_ops->cgroup_layout = CGROUP_LAYOUT_UNKNOWN; - if (!cg_init(cgfsng_ops, conf)) { - free(cgfsng_ops); + if (!cg_init(cgfsng_ops, conf)) return NULL; - } cgfsng_ops->data_init = cgfsng_data_init; cgfsng_ops->payload_destroy = cgfsng_payload_destroy; @@ -2790,5 +2788,5 @@ struct cgroup_ops *cgfsng_ops_init(struct lxc_conf *conf) cgfsng_ops->mount = cgfsng_mount; cgfsng_ops->nrtasks = cgfsng_nrtasks; - return cgfsng_ops; + return move_ptr(cgfsng_ops); } -- 2.39.2