Merge pull request #2897 from trapier/dump-snapshot-redacted-nil-deref

Fix nil pointer deref in dump-snapshot --redacted [FIELD-2081]
moby · Sep 20, 2019 · 8a69c0d · 8a69c0d
2 parents a8bbe7d + a4e520a
commit 8a69c0d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/cmd/swarm-rafttool/dump.go b/cmd/swarm-rafttool/dump.go
@@ -200,15 +200,19 @@ func dumpSnapshot(swarmdir, unlockKey string, redact bool) error {
 			if task != nil {
 				if container := task.Spec.GetContainer(); container != nil {
 					container.Env = []string{"ENVVARS REDACTED"}
-					container.PullOptions.RegistryAuth = "REDACTED"
+					if container.PullOptions != nil {
+						container.PullOptions.RegistryAuth = "REDACTED"
+					}
 				}
 			}
 		}
 		for _, service := range s.Store.Services {
 			if service != nil {
 				if container := service.Spec.Task.GetContainer(); container != nil {
 					container.Env = []string{"ENVVARS REDACTED"}
-					container.PullOptions.RegistryAuth = "REDACTED"
+					if container.PullOptions != nil {
+						container.PullOptions.RegistryAuth = "REDACTED"
+					}
 				}
 			}
 		}