From a70a69e8a042d31e96258488f6d7228b8eac8d6b Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Wed, 3 Jun 2015 17:20:19 +0000 Subject: [PATCH] don't dereference a NULL c->lxc_conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 37cf711b added a destroy hook, but when it checks at destroy time whether that hook exists, it assumes that c->lxc_conf is good. In fact lxc_conf can be NULL, so check for that. Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- src/lxc/lxccontainer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 916c99c91..445cc226b 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -2160,11 +2160,12 @@ static bool container_destroy(struct lxc_container *c) { bool bret = false; int ret; - struct lxc_conf *conf = c->lxc_conf; + struct lxc_conf *conf; if (!c || !do_lxcapi_is_defined(c)) return false; + conf = c->lxc_conf; if (container_disk_lock(c)) return false; @@ -2174,7 +2175,7 @@ static bool container_destroy(struct lxc_container *c) goto out; } - if (!lxc_list_empty(&conf->hooks[LXCHOOK_DESTROY])) { + if (conf && !lxc_list_empty(&conf->hooks[LXCHOOK_DESTROY])) { /* Start of environment variable setup for hooks */ if (setenv("LXC_NAME", c->name, 1)) { SYSERROR("failed to set environment variable for container name");