From 23820d548dcd876bd4a8416f80a4d5d1253cd7dd Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Fri, 4 Dec 2015 18:24:55 -0600 Subject: [PATCH] prune_init_cgroup: don't dereference NULL This is to avoid: https://errors.ubuntu.com/problem/d640a68bf7343705899d7ca8c6bc070d477cd845 Signed-off-by: Serge Hallyn --- src/lxc/cgroup.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c index b1c764f2b..0f7a2ac16 100644 --- a/src/lxc/cgroup.c +++ b/src/lxc/cgroup.c @@ -198,7 +198,12 @@ cgroup_driver_t cgroup_driver(void) #define INIT_SCOPE "/init.scope" void prune_init_scope(char *cg) { - char *point = cg + strlen(cg) - strlen(INIT_SCOPE); + char *point; + + if (!cg) + return; + + point = cg + strlen(cg) - strlen(INIT_SCOPE); if (point < cg) return; if (strcmp(point, INIT_SCOPE) == 0) { -- 2.47.3