From 53f99ddde619e51e2d9174c5990d5f6c94517147 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Tue, 2 May 2017 22:50:27 +0200
Subject: [PATCH] cleanup

---
 common/crypto/chunk.go          | 7 ++++---
 testing/scenarios/vmess_test.go | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/crypto/chunk.go b/common/crypto/chunk.go
index c05fdc68..5b44640c 100644
--- a/common/crypto/chunk.go
+++ b/common/crypto/chunk.go
@@ -37,7 +37,7 @@ type ChunkStreamReader struct {
 
 	buffer       []byte
 	leftOver     buf.MultiBuffer
-	leftOverSize uint16
+	leftOverSize int
 }
 
 func NewChunkStreamReader(sizeDecoder ChunkSizeDecoder, reader io.Reader) *ChunkStreamReader {
@@ -50,6 +50,7 @@ func NewChunkStreamReader(sizeDecoder ChunkSizeDecoder, reader io.Reader) *Chunk
 
 func (r *ChunkStreamReader) readAtLeast(size int) error {
 	mb := r.leftOver
+	r.leftOver = nil
 	for mb.Len() < size {
 		extra, err := r.reader.Read()
 		if err != nil {
@@ -74,7 +75,7 @@ func (r *ChunkStreamReader) readSize() (uint16, error) {
 }
 
 func (r *ChunkStreamReader) Read() (buf.MultiBuffer, error) {
-	size := int(r.leftOverSize)
+	size := r.leftOverSize
 	if size == 0 {
 		nextSize, err := r.readSize()
 		if err != nil {
@@ -94,7 +95,7 @@ func (r *ChunkStreamReader) Read() (buf.MultiBuffer, error) {
 
 	if size >= r.leftOver.Len() {
 		mb := r.leftOver
-		r.leftOverSize = uint16(size - r.leftOver.Len())
+		r.leftOverSize = size - r.leftOver.Len()
 		r.leftOver = nil
 		return mb, nil
 	}
diff --git a/testing/scenarios/vmess_test.go b/testing/scenarios/vmess_test.go
index 75ba41e3..1f2edfbd 100644
--- a/testing/scenarios/vmess_test.go
+++ b/testing/scenarios/vmess_test.go
@@ -647,12 +647,12 @@ func TestVMessNone(t *testing.T) {
 			payload := make([]byte, 10240*1024)
 			rand.Read(payload)
 
-			nBytes, err := conn.Write([]byte(payload))
+			nBytes, err := conn.Write(payload)
 			assert.Error(err).IsNil()
 			assert.Int(nBytes).Equals(len(payload))
 
 			response := readFrom(conn, time.Second*20, 10240*1024)
-			assert.Bytes(response).Equals(xor([]byte(payload)))
+			assert.Bytes(response).Equals(xor(payload))
 			assert.Error(conn.Close()).IsNil()
 			wg.Done()
 		}()