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

handle data first and then error

pull/787/head
Darien Raymond 2017-11-26 15:08:37 +01:00
parent 9a2a19509c
commit 519eb344db
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/buf/copy.go
View File

@ -91,8 +91,7 @@ func copyInternal(reader Reader, writer Writer, handler *copyHandler) error {
buffer.Release() buffer.Release()
return werr return werr
} }
} } else if err != nil {
if err != nil {
return err return err
} }
} }

32
common/buf/reader.go
View File

@ -25,14 +25,15 @@ func NewBytesToBufferReader(reader io.Reader) Reader {
func (r *BytesToBufferReader) readSmall() (MultiBuffer, error) { func (r *BytesToBufferReader) readSmall() (MultiBuffer, error) {
b := New() b := New()
if err := b.Reset(ReadFrom(r.Reader)); err != nil { err := b.Reset(ReadFrom(r.Reader))
b.Release()
return nil, err
}
if b.IsFull() { if b.IsFull() {
r.buffer = make([]byte, 32*1024) r.buffer = make([]byte, 32*1024)
} }
return NewMultiBufferValue(b), nil if !b.IsEmpty() {
return NewMultiBufferValue(b), nil
}
b.Release()
return nil, err
} }
// ReadMultiBuffer implements Reader. // ReadMultiBuffer implements Reader.
@ -45,7 +46,7 @@ func (r *BytesToBufferReader) ReadMultiBuffer() (MultiBuffer, error) {
if nBytes > 0 { if nBytes > 0 {
mb := NewMultiBufferCap(nBytes/Size + 1) mb := NewMultiBufferCap(nBytes/Size + 1)
mb.Write(r.buffer[:nBytes]) mb.Write(r.buffer[:nBytes])
return mb, err return mb, nil
} }
return nil, err return nil, err
} }
@ -122,17 +123,20 @@ func (r *BufferedReader) ReadMultiBuffer() (MultiBuffer, error) {
} }
// ReadAtMost returns a MultiBuffer with at most size. // ReadAtMost returns a MultiBuffer with at most size.
func (r *BufferedReader) ReadAtMost(size int) (mb MultiBuffer, err error) { func (r *BufferedReader) ReadAtMost(size int) (MultiBuffer, error) {
if r.leftOver == nil { if r.leftOver == nil {
r.leftOver, err = r.stream.ReadMultiBuffer() mb, err := r.stream.ReadMultiBuffer()
} if mb.IsEmpty() && err != nil {
if r.leftOver != nil { return nil, err
mb = r.leftOver.SliceBySize(size)
if r.leftOver.IsEmpty() {
r.leftOver = nil
} }
r.leftOver = mb
} }
return
mb := r.leftOver.SliceBySize(size)
if r.leftOver.IsEmpty() {
r.leftOver = nil
}
return mb, nil
} }
func (r *BufferedReader) writeToInternal(writer io.Writer) (int64, error) { func (r *BufferedReader) writeToInternal(writer io.Writer) (int64, error) {