don't dereference a NULL c->lxc_conf

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 <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

don't dereference a NULL c->lxc_conf
a70a69e8 · Serge Hallyn · Stéphane Graber · 755fa453 · a70a69e8
Commit a70a69e8 authored Jun 03, 2015 by Serge Hallyn Committed by Stéphane Graber Jun 03, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

lxccontainer.c src/lxc/lxccontainer.c +3 -2

No files found.
--- 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");