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

fix #999

pull/1008/head
Darien Raymond 2018-03-28 14:33:34 +02:00
parent a52f6ec02a
commit eeed65f826
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/buf/multi_buffer.go
View File

@ -167,7 +167,7 @@ func (mb *MultiBuffer) SliceBySize(size int) MultiBuffer {
} }
*mb = (*mb)[endIndex:] *mb = (*mb)[endIndex:]
if endIndex == 0 && len(*mb) > 0 { if endIndex == 0 && len(*mb) > 0 {
b := New() b := NewSize(uint32(size))
common.Must(b.Reset(ReadFullFrom((*mb)[0], size))) common.Must(b.Reset(ReadFullFrom((*mb)[0], size)))
return NewMultiBufferValue(b) return NewMultiBufferValue(b)
} }

15
common/buf/multi_buffer_test.go
View File

@ -1,8 +1,10 @@
package buf_test package buf_test
import ( import (
"crypto/rand"
"testing" "testing"
"v2ray.com/core/common"
. "v2ray.com/core/common/buf" . "v2ray.com/core/common/buf"
. "v2ray.com/ext/assert" . "v2ray.com/ext/assert"
) )
@ -33,3 +35,16 @@ func TestMultiBufferAppend(t *testing.T) {
mb.Append(b) mb.Append(b)
assert(mb.Len(), Equals, 2) assert(mb.Len(), Equals, 2)
} }
func TestMultiBufferSliceBySizeLarge(t *testing.T) {
assert := With(t)
lb := NewSize(8 * 1024)
common.Must(lb.Reset(ReadFrom(rand.Reader)))
var mb MultiBuffer
mb.Append(lb)
mb2 := mb.SliceBySize(4 * 1024)
assert(mb2.Len(), Equals, 4*1024)
}