clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 04:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nil pointer on some situatuion

Browse Source
This commit is contained in:
Guillaume J. Charmes
2013-06-04 14:35:32 -07:00
parent 0ca8844398
commit 63e80384ea
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container.go
+12 -10
View File
@@ -357,14 +357,15 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
}
} else {
go func() {
defer stdinCloser.Close()
if stdinCloser != nil {
defer stdinCloser.Close()
}
cStdout, err := container.StdoutPipe()
if err != nil {
if cStdout, err := container.StdoutPipe(); err != nil {
utils.Debugf("Error stdout pipe")
return
} 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()
if stdinCloser != nil {
defer stdinCloser.Close()
}
cStderr, err := container.StdoutPipe()
if err != nil {
if cStderr, err := container.StdoutPipe(); err != nil {
utils.Debugf("Error stdout pipe")
return
} else {
io.Copy(&utils.NopWriter{}, cStderr)
}
io.Copy(&utils.NopWriter{}, cStderr)
}()
}