github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

avoid writing empty payload in bytesToBufferWriter

pull/700/head
Darien Raymond 2017-11-08 23:43:16 +01:00
parent cf080e8061
commit 3d2fd372e1
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/buf/writer.go
View File

@ -90,11 +90,10 @@ func (w *bytesToBufferWriter) WriteMultiBuffer(mb MultiBuffer) error {
func (w *bytesToBufferWriter) ReadFrom(reader io.Reader) (int64, error) { func (w *bytesToBufferWriter) ReadFrom(reader io.Reader) (int64, error) {
mbReader := NewReader(reader) mbReader := NewReader(reader)
totalBytes := int64(0) totalBytes := int64(0)
eof := false for {
for !eof {
mb, err := mbReader.Read() mb, err := mbReader.Read()
if err == io.EOF { if errors.Cause(err) == io.EOF {
eof = true break
} else if err != nil { } else if err != nil {
return totalBytes, err return totalBytes, err
} }