shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

core: do not free heap-allocated strings (#8391)

Browse Source 
Fixes #8387.
This commit is contained in:
Yu Watanabe 2018-03-08 22:21:54 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 280029d18f
commit 5cbaad2f67
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/mount-setup.c
View File

@ -248,6 +248,7 @@ int mount_setup_early(void) {
int mount_cgroup_controllers(char ***join_controllers) {
_cleanup_set_free_free_ Set *controllers = NULL;
bool has_argument = !!join_controllers;
int r;
if (!cg_is_legacy_wanted())
@ -255,7 +256,7 @@ int mount_cgroup_controllers(char ***join_controllers) {
/* Mount all available cgroup controllers that are built into the kernel. */
if (!join_controllers)
if (!has_argument)
/* The defaults:
* mount "cpu" + "cpuacct" together, and "net_cls" + "net_prio".
*
@ -300,7 +301,8 @@ int mount_cgroup_controllers(char ***join_controllers) {
t = set_remove(controllers, *i);
if (!t) {
free(*i);
if (has_argument)
free(*i);
continue;
}
}