lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

simplify NewSize calls

Browse Source
This commit is contained in:
Darien Raymond 2018-03-12 22:10:13 +01:00
parent 0c213ccd20
commit 1cbfeea0cd
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/proxyman/mux/reader.go
View File

@ -51,12 +51,7 @@ func (r *PacketReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
return nil, err return nil, err
} }
var b *buf.Buffer b := buf.NewSize(uint32(size))
if size <= buf.Size {
b = buf.New()
} else {
b = buf.NewSize(uint32(size))
}
if err := b.AppendSupplier(buf.ReadFullFrom(r.reader, int(size))); err != nil { if err := b.AppendSupplier(buf.ReadFullFrom(r.reader, int(size))); err != nil {
b.Release() b.Release()
return nil, err return nil, err

7
common/crypto/auth.go
View File

@ -124,12 +124,7 @@ func (r *AuthenticationReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
return nil, io.EOF return nil, io.EOF
} }
var b *buf.Buffer b := buf.NewSize(uint32(size))
if size <= buf.Size {
b = buf.New()
} else {
b = buf.NewSize(uint32(size))
}
if err := b.Reset(buf.ReadFullFrom(r.reader, size)); err != nil { if err := b.Reset(buf.ReadFullFrom(r.reader, size)); err != nil {
b.Release() b.Release()
return nil, err return nil, err

20
proxy/shadowsocks/ota.go
View File

@ -70,22 +70,14 @@ func NewChunkReader(reader io.Reader, auth *Authenticator) *ChunkReader {
} }
func (v *ChunkReader) ReadMultiBuffer() (buf.MultiBuffer, error) { func (v *ChunkReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
buffer := buf.New() size, err := serial.ReadUint16(v.reader)
if err := buffer.AppendSupplier(buf.ReadFullFrom(v.reader, 2)); err != nil { if err != nil {
buffer.Release() return nil, newError("failed to read size")
return nil, err
}
// There is a potential buffer overflow here. Large buffer is 64K bytes,
// while uin16 + 10 will be more than that
length := serial.BytesToUint16(buffer.BytesTo(2)) + AuthSize
if length > buf.Size {
// Theoretically the size of a chunk is 64K, but most Shadowsocks implementations used <4K buffer.
buffer.Release()
buffer = buf.NewSize(uint32(length) + 128)
} }
size += AuthSize
buffer.Clear() buffer := buf.NewSize(uint32(size))
if err := buffer.AppendSupplier(buf.ReadFullFrom(v.reader, int(length))); err != nil { if err := buffer.AppendSupplier(buf.ReadFullFrom(v.reader, int(size))); err != nil {
buffer.Release() buffer.Release()
return nil, err return nil, err
} }