Close tty on error before handler

crosbymichael · crosbymichael · commit 45675581c126 · 2016-02-10T13:41:35.000-08:00
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/utils.go b/utils.go
@@ -308,13 +308,15 @@ func runProcess(container libcontainer.Container, config *specs.Process, listenF
 	}
 
 	if err := container.Start(process); err != nil {
+		tty.Close()
 		return -1, err
 	}
 
 	if pidFile != "" {
 		if err := createPidFile(pidFile, process); err != nil {
 			process.Signal(syscall.SIGKILL)
 			process.Wait()
+			tty.Close()
 			return -1, err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -308,13 +308,15 @@ func runProcess(container libcontainer.Container, config *specs.Process, listenF`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`if err := container.Start(process); err != nil {`
	`311`	`+ tty.Close()`
`311`	`312`	`return -1, err`
`312`	`313`	`}`
`313`	`314`
`314`	`315`	`if pidFile != "" {`
`315`	`316`	`if err := createPidFile(pidFile, process); err != nil {`
`316`	`317`	`process.Signal(syscall.SIGKILL)`
`317`	`318`	`process.Wait()`
	`319`	`+ tty.Close()`
`318`	`320`	`return -1, err`
`319`	`321`	`}`
`320`	`322`	`}`