Merge pull request moby#14880 from Microsoft/10662-paniconremotetest

Stop SIGSEGV on test dial not reachable
sjhx · Jul 23, 2015 · d593130 · d593130
2 parents c5053d4 + 09b86c4
commit d593130
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go
@@ -338,11 +338,9 @@ func sockRequest(method, endpoint string, data interface{}) (int, []byte, error)
 
 	res, body, err := sockRequestRaw(method, endpoint, jsonData, "application/json")
 	if err != nil {
-		b, _ := ioutil.ReadAll(body)
-		return -1, b, err
+		return -1, nil, err
 	}
-	var b []byte
-	b, err = readBody(body)
+	b, err := readBody(body)
 	return res.StatusCode, b, err
 }