From f4d287eaa23f7ad511a35a104e8f00aeda28ce13 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 9 Dec 2020 09:58:11 +0100 Subject: [PATCH] confile_utils: cleanup set_config_string_item() Signed-off-by: Christian Brauner --- src/lxc/confile_utils.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c index f0358eb0d..474ac58d1 100644 --- a/src/lxc/confile_utils.c +++ b/src/lxc/confile_utils.c @@ -628,19 +628,15 @@ int set_config_string_item(char **conf_item, const char *value) char *new_value; if (lxc_config_value_empty(value)) { - free(*conf_item); - *conf_item = NULL; + free_disarm(*conf_item); return 0; } new_value = strdup(value); - if (!new_value) { - SYSERROR("Failed to duplicate string \"%s\"", value); - return -1; - } + if (!new_value) + return log_error_errno(-ENOMEM, ENOMEM, "Failed to duplicate string \"%s\"", value); - free(*conf_item); - *conf_item = new_value; + free_move_ptr(*conf_item, new_value); return 0; } -- 2.47.2