lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-29 05:25:21 -05:00
Code Issues Releases Wiki Activity

check errors

Browse Source
This commit is contained in:
Darien Raymond
2018-07-29 13:19:03 +02:00
parent 18f3fb5196
commit 47f1399995
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/buf/reader.go
View File

@@ -97,8 +97,9 @@ func (r *BufferedReader) ReadByte() (byte, error) {
// Read implements io.Reader. It reads from internal buffer first (if available) and then reads from the underlying reader.
func (r *BufferedReader) Read(b []byte) (int, error) {
if r.Buffer != nil {
nBytes, _ := r.Buffer.Read(b)
if !r.Buffer.IsEmpty() {
nBytes, err := r.Buffer.Read(b)
common.Must(err)
if r.Buffer.IsEmpty() {
r.Buffer.Release()
r.Buffer = nil
@@ -113,19 +114,21 @@ func (r *BufferedReader) Read(b []byte) (int, error) {
}
mb, err := r.Reader.ReadMultiBuffer()
if mb != nil {
nBytes, _ := mb.Read(b)
if !mb.IsEmpty() {
r.Buffer = mb
}
return nBytes, err
if err != nil {
return 0, err
}
return 0, err
nBytes, err := mb.Read(b)
common.Must(err)
if !mb.IsEmpty() {
r.Buffer = mb
}
return nBytes, err
}
// ReadMultiBuffer implements Reader.
func (r *BufferedReader) ReadMultiBuffer() (MultiBuffer, error) {
if r.Buffer != nil {
if !r.Buffer.IsEmpty() {
mb := r.Buffer
r.Buffer = nil
return mb, nil
@@ -136,7 +139,7 @@ func (r *BufferedReader) ReadMultiBuffer() (MultiBuffer, error) {
// ReadAtMost returns a MultiBuffer with at most size.
func (r *BufferedReader) ReadAtMost(size int32) (MultiBuffer, error) {
if r.Buffer == nil {
if r.Buffer.IsEmpty() {
mb, err := r.Reader.ReadMultiBuffer()
if mb.IsEmpty() && err != nil {
return nil, err