Merge pull request #1206 from cwoac/master

Fix null derefence if attach is called without access to any tty

Merge pull request #1206 from cwoac/master
021eb126 · Christian Brauner · GitHub · 0f73b621 · b9a24c4f · 021eb126
Commit 021eb126 authored Sep 25, 2016 by Christian Brauner Committed by GitHub Sep 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lxc_attach.c src/lxc/tools/lxc_attach.c +1 -1

No files found.
--- a/src/lxc/tools/lxc_attach.c
+++ b/src/lxc/tools/lxc_attach.c
@@ -321,7 +321,7 @@ static int get_pty_on_host(struct lxc_container *c, struct wrapargs *wrap, int *
 err3:
 	lxc_mainloop_close(&descr);
 err2:
-	if (ts->sigfd != -1)
+	if (ts && ts->sigfd != -1)
 		lxc_console_sigwinch_fini(ts);
 err1:
 	lxc_console_delete(&conf->console);