shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-06 12:58:22 +03:00
Code

systemctl: edit: fix double free of instanced name

Browse Source 
There is a double free of unit_name when an instance is used, causing
systemctl --user edit service@instance to abort.

(cherry picked from commit fe5cb7a7aec49cdc77d02e109dde81293e4566a0)
This commit is contained in:
Ronan Pigott 2023-02-18 13:03:07 -07:00 committed by Zbigniew Jędrzejewski-Szmek
parent c4cdbb978f
commit 5140da8937
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/systemctl/systemctl-edit.c
View File

@ -457,7 +457,7 @@ static int find_paths_to_edit(
return r;
STRV_FOREACH(name, names) {
_cleanup_free_ char *path = NULL, *tmp_name = NULL;
_cleanup_free_ char *path = NULL;
_cleanup_strv_free_ char **unit_paths = NULL;
r = unit_find_paths(bus, *name, &lp, false, &cached_name_map, &cached_id_map, &path, &unit_paths);
@ -501,7 +501,7 @@ static int find_paths_to_edit(
/* We follow unit aliases, but we need to propagate the instance */
if (unit_name_is_valid(*name, UNIT_NAME_INSTANCE) &&
unit_name_is_valid(unit_name, UNIT_NAME_TEMPLATE)) {
_cleanup_free_ char *instance = NULL;
_cleanup_free_ char *instance = NULL, *tmp_name = NULL;
r = unit_name_to_instance(*name, &instance);
if (r < 0)
@ -511,7 +511,7 @@ static int find_paths_to_edit(
if (r < 0)
return r;
unit_name = tmp_name;
free_and_replace(unit_name, tmp_name);
}
if (arg_full)