diff options
| author | Ronny Chevalier <chevalier.ronny@gmail.com> | 2015-04-10 15:44:02 +0200 |
|---|---|---|
| committer | Ronny Chevalier <chevalier.ronny@gmail.com> | 2015-04-10 15:44:02 +0200 |
| commit | 0d67448869bd881fd6aea57de6da98800395cf1f (patch) | |
| tree | 60e91b5d0b2497fc79e0ccd59f4a14d295a3c05d | |
| parent | util: mark unquote() static, so that new code doesn't use this anymore (diff) | |
| download | systemd-0d67448869bd881fd6aea57de6da98800395cf1f.tar.xz systemd-0d67448869bd881fd6aea57de6da98800395cf1f.zip | |
shared: fix memleak
path was used for 2 purposes but it was not freed before being reused.
| -rw-r--r-- | src/shared/install.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 1cc999b4d3..b121018e97 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -514,7 +514,7 @@ static int find_symlinks_in_scope( UnitFileState *state) { int r; - _cleanup_free_ char *path = NULL; + _cleanup_free_ char *normal_path = NULL, *runtime_path = NULL; bool same_name_link_runtime = false, same_name_link = false; assert(scope >= 0); @@ -522,11 +522,11 @@ static int find_symlinks_in_scope( assert(name); /* First look in runtime config path */ - r = get_config_path(scope, true, root_dir, &path); + r = get_config_path(scope, true, root_dir, &normal_path); if (r < 0) return r; - r = find_symlinks(name, path, &same_name_link_runtime); + r = find_symlinks(name, normal_path, &same_name_link_runtime); if (r < 0) return r; else if (r > 0) { @@ -535,11 +535,11 @@ static int find_symlinks_in_scope( } /* Then look in the normal config path */ - r = get_config_path(scope, false, root_dir, &path); + r = get_config_path(scope, false, root_dir, &runtime_path); if (r < 0) return r; - r = find_symlinks(name, path, &same_name_link); + r = find_symlinks(name, runtime_path, &same_name_link); if (r < 0) return r; else if (r > 0) { |