From ad5b307d0fb00ff0a63b3f97e529fa67bfce50b3 Mon Sep 17 00:00:00 2001 From: Erik Hollensbe Date: Fri, 31 Oct 2014 04:20:26 +0000 Subject: [PATCH] proxy: Fix a potential panic handling error states. Docker-DCO-1.1-Signed-off-by: Erik Hollensbe (github: erikh) --- daemon/networkdriver/portmapper/proxy.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/daemon/networkdriver/portmapper/proxy.go b/daemon/networkdriver/portmapper/proxy.go index af20469ed8..e4a17bcd9a 100644 --- a/daemon/networkdriver/portmapper/proxy.go +++ b/daemon/networkdriver/portmapper/proxy.go @@ -130,7 +130,12 @@ func (p *proxyCommand) Start() error { r.Read(buf) if string(buf) != "0\n" { - errStr, _ := ioutil.ReadAll(r) + errStr, err := ioutil.ReadAll(r) + if err != nil { + errchan <- fmt.Errorf("Error reading exit status from userland proxy: %v", err) + return + } + errchan <- fmt.Errorf("Error starting userland proxy: %s", errStr) return }