projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a60f73b
)
14758: Fix panic on error reading request body.
author
Tom Clegg <tclegg@veritasgenetics.com>
Mon, 1 Apr 2019 14:40:43 +0000
(10:40 -0400)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Mon, 1 Apr 2019 15:16:41 +0000
(11:16 -0400)
The deferred inline func panics if status != 200 && err == nil.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/keepproxy/keepproxy.go
patch
|
blob
|
history
diff --git
a/services/keepproxy/keepproxy.go
b/services/keepproxy/keepproxy.go
index fc4783eff9a41f342211fc1aa1e6f67520fc7185..0cb93ffb3182803aa3a4ea3094cf68f15ff1ef8a 100644
(file)
--- a/
services/keepproxy/keepproxy.go
+++ b/
services/keepproxy/keepproxy.go
@@
-541,7
+541,7
@@
func (h *proxyHandler) Put(resp http.ResponseWriter, req *http.Request) {
if locatorIn == "" {
bytes, err2 := ioutil.ReadAll(req.Body)
if err2 != nil {
-
_ = errors.New(fmt.Sprintf("Error reading request body: %s", err2)
)
+
err = fmt.Errorf("Error reading request body: %s", err2
)
status = http.StatusInternalServerError
return
}