Merge pull request #563 from mlaventure/notty-detach-panic

Prevent a panic when container fails to start
opencontainers · Feb 16, 2016 · 8ce2413 · 8ce2413
2 parents 533ee4d + b011f80
commit 8ce2413
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/utils.go b/utils.go
@@ -311,15 +311,19 @@ func runProcess(container libcontainer.Container, config *specs.Process, listenF
 	defer handler.Close()
 
 	if err := container.Start(process); err != nil {
-		tty.Close()
+		if tty != nil {
+			tty.Close()
+		}
 		return -1, err
 	}
 
 	if pidFile != "" {
 		if err := createPidFile(pidFile, process); err != nil {
 			process.Signal(syscall.SIGKILL)
 			process.Wait()
-			tty.Close()
+			if tty != nil {
+				tty.Close()
+			}
 			return -1, err
 		}
 	}