Skip to content

L
lxc
Commit a70a69e8 by Serge Hallyn Committed by Stéphane Graber
Options

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: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 755fa453
Showing with 3 additions and 2 deletions
src/lxc/lxccontainer.c
...@@ -2160,11 +2160,12 @@ static bool container_destroy(struct lxc_container *c) ...@@ -2160,11 +2160,12 @@ static bool container_destroy(struct lxc_container *c)
{ {
bool bret = false; bool bret = false;
int ret; int ret;
struct lxc_conf *conf = c->lxc_conf; struct lxc_conf *conf;
if (!c || !do_lxcapi_is_defined(c)) if (!c || !do_lxcapi_is_defined(c))
return false; return false;
conf = c->lxc_conf;
if (container_disk_lock(c)) if (container_disk_lock(c))
return false; return false;
...@@ -2174,7 +2175,7 @@ static bool container_destroy(struct lxc_container *c) ...@@ -2174,7 +2175,7 @@ static bool container_destroy(struct lxc_container *c)
goto out; 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 */ /* Start of environment variable setup for hooks */
if (setenv("LXC_NAME", c->name, 1)) { if (setenv("LXC_NAME", c->name, 1)) {
SYSERROR("failed to set environment variable for container name"); SYSERROR("failed to set environment variable for container name");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment