Browse code

proxy: Fix a potential panic handling error states.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)

Erik Hollensbe authored on 2014/10/31 13:20:26
Showing 1 changed files
... ...
@@ -130,7 +130,12 @@ func (p *proxyCommand) Start() error {
130 130
 		r.Read(buf)
131 131
 
132 132
 		if string(buf) != "0\n" {
133
-			errStr, _ := ioutil.ReadAll(r)
133
+			errStr, err := ioutil.ReadAll(r)
134
+			if err != nil {
135
+				errchan <- fmt.Errorf("Error reading exit status from userland proxy: %v", err)
136
+				return
137
+			}
138
+
134 139
 			errchan <- fmt.Errorf("Error starting userland proxy: %s", errStr)
135 140
 			return
136 141
 		}