From 5a30e27f04e136d98f83e0fc4cb94203cd31b116 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Wed, 19 Apr 2017 23:30:18 +0200
Subject: [PATCH] use normal byte array

---
 common/buf/io.go     |  2 +-
 common/buf/reader.go | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/buf/io.go b/common/buf/io.go
index f0682b25..5196683a 100644
--- a/common/buf/io.go
+++ b/common/buf/io.go
@@ -83,7 +83,7 @@ func NewReader(reader io.Reader) Reader {
 
 	return &BytesToBufferReader{
 		reader: reader,
-		buffer: NewLocal(32 * 1024),
+		buffer: make([]byte, 32*1024),
 	}
 }
 
diff --git a/common/buf/reader.go b/common/buf/reader.go
index e8c31ff5..b0f5a73b 100644
--- a/common/buf/reader.go
+++ b/common/buf/reader.go
@@ -9,20 +9,23 @@ import (
 // BytesToBufferReader is a Reader that adjusts its reading speed automatically.
 type BytesToBufferReader struct {
 	reader io.Reader
-	buffer *Buffer
+	buffer []byte
 }
 
 // Read implements Reader.Read().
 func (r *BytesToBufferReader) Read() (MultiBuffer, error) {
-	if err := r.buffer.Reset(ReadFrom(r.reader)); err != nil {
+	nBytes, err := r.reader.Read(r.buffer)
+	if err != nil {
 		return nil, err
 	}
 
 	mb := NewMultiBuffer()
-	for !r.buffer.IsEmpty() {
+	p := r.buffer[:nBytes]
+	for len(p) > 0 {
 		b := New()
-		b.AppendSupplier(ReadFrom(r.buffer))
+		nBytes, _ := b.Write(p)
 		mb.Append(b)
+		p = p[nBytes:]
 	}
 	return mb, nil
 }