Merge pull request #1833 from brauner/2017-09-27/check_for_initialized_conf

cgfsng: check whether we have a conf

Merge pull request #1833 from brauner/2017-09-27/check_for_initialized_conf
39911798 · Stéphane Graber · GitHub · 50b92d00 · 9b5396f9 · 39911798
Commit 39911798 authored Sep 27, 2017 by Stéphane Graber Committed by GitHub Sep 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

cgfsng.c src/lxc/cgroups/cgfsng.c +4 -2

No files found.
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1175,8 +1175,10 @@ static void *cgfsng_init(struct lxc_handler *handler)
 	d->name = must_copy_string(handler->name);

 	/* copy per-container cgroup information */
-	d->cgroup_meta.dir = must_copy_string(handler->conf->cgroup_meta.dir);
-	d->cgroup_meta.controllers = must_copy_string(handler->conf->cgroup_meta.controllers);
+	if (handler->conf) {
+		d->cgroup_meta.dir = must_copy_string(handler->conf->cgroup_meta.dir);
+		d->cgroup_meta.controllers = must_copy_string(handler->conf->cgroup_meta.controllers);
+	}

 	/* copy system-wide cgroup information */
 	cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern");