container: check containerInfo.Config before accessing it

check that containerInfo.Config is not nil before trying to access it. Closes: containers#2654 Signed-off-by: Giuseppe Scrivano <[email protected]>
giuseppe · Mar 15, 2019 · 508e084 · 508e084
1 parent 3985985
commit 508e084
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
@@ -337,11 +337,13 @@ func (c *Container) setupStorage(ctx context.Context) error {
 	}
 
 	// Set the default Entrypoint and Command
-	if c.config.Entrypoint == nil {
-		c.config.Entrypoint = containerInfo.Config.Config.Entrypoint
-	}
-	if c.config.Command == nil {
-		c.config.Command = containerInfo.Config.Config.Cmd
+	if containerInfo.Config != nil {
+		if c.config.Entrypoint == nil {
+			c.config.Entrypoint = containerInfo.Config.Config.Entrypoint
+		}
+		if c.config.Command == nil {
+			c.config.Command = containerInfo.Config.Config.Cmd
+		}
 	}
 
 	artifacts := filepath.Join(c.config.StaticDir, artifactsDir)