From f66655fd771109e44b84a5a0507cfa1ee5afa234 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Mon, 14 Dec 2015 12:22:14 +0100 Subject: [PATCH] FIX #2280 prevent nil dereference Signed-off-by: David Gageot --- commands/ls.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/commands/ls.go b/commands/ls.go index d9955fb9..4204e4be 100644 --- a/commands/ls.go +++ b/commands/ls.go @@ -80,13 +80,15 @@ func cmdLs(c CommandLine, api libmachine.API) error { fmt.Fprintln(w, "NAME\tACTIVE\tDRIVER\tSTATE\tURL\tSWARM\tDOCKER\tERRORS") for _, host := range hostList { - swarmOptions := host.HostOptions.SwarmOptions - if swarmOptions.Master { - swarmMasters[swarmOptions.Discovery] = host.Name - } + if host.HostOptions != nil { + swarmOptions := host.HostOptions.SwarmOptions + if swarmOptions.Master { + swarmMasters[swarmOptions.Discovery] = host.Name + } - if swarmOptions.Discovery != "" { - swarmInfo[host.Name] = swarmOptions.Discovery + if swarmOptions.Discovery != "" { + swarmInfo[host.Name] = swarmOptions.Discovery + } } }