toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix nil pointer on some situatuion

Browse Source 
Upstream-commit: 63e80384ea753c74046c2a4c3f64229c359f466f
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-06-04 14:35:32 -07:00
parent 6f2fd272da
commit 8f6d6bc6c7
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
components/engine/container.go
View File

@ -357,14 +357,15 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
}
} else {
go func() {
defer stdinCloser.Close()
cStdout, err := container.StdoutPipe()
if err != nil {
utils.Debugf("Error stdout pipe")
return
if stdinCloser != nil {
defer stdinCloser.Close()
}
if cStdout, err := container.StdoutPipe(); err != nil {
utils.Debugf("Error stdout pipe")
} else {
io.Copy(&utils.NopWriter{}, cStdout)
}
io.Copy(&utils.NopWriter{}, cStdout)
}()
}
if stderr != nil {
@ -394,14 +395,15 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
}
} else {
go func() {
defer stdinCloser.Close()
cStderr, err := container.StdoutPipe()
if err != nil {
utils.Debugf("Error stdout pipe")
return
if stdinCloser != nil {
defer stdinCloser.Close()
}
if cStderr, err := container.StdoutPipe(); err != nil {
utils.Debugf("Error stdout pipe")
} else {
io.Copy(&utils.NopWriter{}, cStderr)
}
io.Copy(&utils.NopWriter{}, cStderr)
}()
}