From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Sat, 5 Dec 2015 00:24:55 +0000 (-0600)
Subject: prune_init_cgroup: don't dereference NULL
X-Git-Tag: lxc-2.0.0.beta1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23820d548dcd876bd4a8416f80a4d5d1253cd7dd;p=thirdparty%2Flxc.git

prune_init_cgroup: don't dereference NULL

This is to avoid:

https://errors.ubuntu.com/problem/d640a68bf7343705899d7ca8c6bc070d477cd845

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

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) {