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

fix dead loop in merging reader

pull/432/head
Darien Raymond 2017-03-28 13:10:57 +02:00
parent f643344154
commit b2c7b1a120
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/buf/merge_reader.go
View File

@ -15,7 +15,9 @@ func NewMergingReader(reader Reader) Reader {
func (r *MergingReader) Read() (*Buffer, error) { func (r *MergingReader) Read() (*Buffer, error) {
if r.leftover != nil { if r.leftover != nil {
return r.leftover, nil b := r.leftover
r.leftover = nil
return b, nil
} }
b, err := r.reader.Read() b, err := r.reader.Read()