From 3d6374dfb8b85537dfa4284a9f0dd87497c63cf7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 30 Apr 2015 12:33:35 +0200 Subject: [PATCH] core: catch some special cases in cg_slice_to_path() --- src/shared/cgroup-util.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index 2654efa1c..ce8ebb2ca 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -1641,6 +1641,16 @@ int cg_slice_to_path(const char *unit, char **ret) { assert(unit); assert(ret); + if (streq(unit, "-.slice")) { + char *x; + + x = strdup(""); + if (!x) + return -ENOMEM; + *ret = x; + return 0; + } + if (!unit_name_is_valid(unit, TEMPLATE_INVALID)) return -EINVAL; @@ -1656,8 +1666,10 @@ int cg_slice_to_path(const char *unit, char **ret) { _cleanup_free_ char *escaped = NULL; char n[dash - p + sizeof(".slice")]; - strcpy(stpncpy(n, p, dash - p), ".slice"); + if (isempty(dash + 1)) + return -EINVAL; + strcpy(stpncpy(n, p, dash - p), ".slice"); if (!unit_name_is_valid(n, TEMPLATE_INVALID)) return -EINVAL; -- 2.30.2