Merge pull request #3087 from brauner/master

cgroup: check for non-empty conf

diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c
index bf92bf2985fb05c963c0c86e44737baceeff0b8d..5443bd96116950d4ab5ae5fda81b189e47bd9335 100644 (file)
--- a/src/lxc/cgroups/cgroup.c
+++ b/src/lxc/cgroups/cgroup.c
@@ -44,6 +44,11 @@ struct cgroup_ops *cgroup_init(struct lxc_conf *conf)
 {
        struct cgroup_ops *cgroup_ops;
 
+       if (!conf) {
+               ERROR("No valid conf given");
+               return NULL;
+       }
+
        cgroup_ops = cgfsng_ops_init(conf);
        if (!cgroup_ops) {
                ERROR("Failed to initialize cgroup driver");