diff options
Diffstat (limited to 'sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch')
| -rw-r--r-- | sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch b/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch new file mode 100644 index 000000000000..3ee2527f77d2 --- /dev/null +++ b/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch @@ -0,0 +1,44 @@ +From 84c5e8010042788a03cff680592b37257b2a6de0 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe <watanabe.yu+github@gmail.com> +Date: Thu, 8 Mar 2018 22:21:54 +0900 +Subject: [PATCH 2/2] core: do not free heap-allocated strings (#8391) + +Fixes #8387. +--- + src/core/mount-setup.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c +index 536c17b4d..9c27972af 100644 +--- a/src/core/mount-setup.c ++++ b/src/core/mount-setup.c +@@ -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; + } + } +-- +2.16.2 + |