Skip to content

L
lxc
Commit 6ed46d9e by Andrey Mazo Committed by Serge Hallyn
Options

Fix invalid free() in lxc_global_config_value().

Commit 4878dac4 introduced possible incorrect usage of free(). Also remove unneeded strdup(). Signed-off-by: 's avatarAndrey Mazo <mazo@telum.ru> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent e99facec
Showing with 2 additions and 7 deletions
src/lxc/utils.c
...@@ -259,13 +259,10 @@ const char *lxc_global_config_value(const char *option_name) ...@@ -259,13 +259,10 @@ const char *lxc_global_config_value(const char *option_name)
char *user_config_path = NULL; char *user_config_path = NULL;
char *user_lxc_path = NULL; char *user_lxc_path = NULL;
char *user_home = NULL;
if (geteuid() > 0) { if (geteuid() > 0) {
user_home = getenv("HOME"); const char *user_home = getenv("HOME");
if (user_home) if (!user_home)
user_home = strdup(user_home);
else
user_home = "/"; user_home = "/";
user_config_path = malloc(sizeof(char) * (22 + strlen(user_home))); user_config_path = malloc(sizeof(char) * (22 + strlen(user_home)));
...@@ -273,8 +270,6 @@ const char *lxc_global_config_value(const char *option_name) ...@@ -273,8 +270,6 @@ const char *lxc_global_config_value(const char *option_name)
sprintf(user_config_path, "%s/.config/lxc/lxc.conf", user_home); sprintf(user_config_path, "%s/.config/lxc/lxc.conf", user_home);
sprintf(user_lxc_path, "%s/.local/share/lxc/", user_home); sprintf(user_lxc_path, "%s/.local/share/lxc/", user_home);
free(user_home);
} }
else { else {
user_config_path = strdup(LXC_GLOBAL_CONF); user_config_path = strdup(LXC_GLOBAL_CONF);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment