MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-26 07:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid sending errors in gob in storage requests (#10977)

Browse Source
This commit is contained in:
Anis Elleuch 2020-11-25 21:42:48 +01:00 committed by GitHub
parent 2ff655a745
commit 91130e884b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/storage-rest-server.go
View File

@ -18,7 +18,6 @@ package cmd
import ( import (
"bufio" "bufio"
"bytes"
"encoding/binary" "encoding/binary"
"encoding/gob" "encoding/gob"
"encoding/hex" "encoding/hex"
@ -828,15 +827,8 @@ func streamHTTPResponse(w http.ResponseWriter) *httpStreamResponse {
ticker.Stop() ticker.Stop()
defer close(doneCh) defer close(doneCh)
if err != nil { if err != nil {
var buf bytes.Buffer w.Write([]byte{1})
enc := gob.NewEncoder(&buf) w.Write([]byte(err.Error()))
if ee := enc.Encode(err); ee == nil {
w.Write([]byte{3})
w.Write(buf.Bytes())
} else {
w.Write([]byte{1})
w.Write([]byte(err.Error()))
}
} else { } else {
w.Write([]byte{0}) w.Write([]byte{0})
} }
@ -882,7 +874,8 @@ func waitForHTTPStream(respBody io.ReadCloser, w io.Writer) error {
respBody.Close() respBody.Close()
return errors.New(string(errorText)) return errors.New(string(errorText))
case 3: case 3:
// Typed error // gob style is already deprecated, we can remove this when
// storage API version will be greater or equal to 23.
defer respBody.Close() defer respBody.Close()
dec := gob.NewDecoder(respBody) dec := gob.NewDecoder(respBody)
var err error var err error