From b2c7b1a1208dd58f46436fbbfe0ffa0c109e8e2d Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Tue, 28 Mar 2017 13:10:57 +0200
Subject: [PATCH] fix dead loop in merging reader

---
 common/buf/merge_reader.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/buf/merge_reader.go b/common/buf/merge_reader.go
index 5dc8df656..a272163de 100644
--- a/common/buf/merge_reader.go
+++ b/common/buf/merge_reader.go
@@ -15,7 +15,9 @@ func NewMergingReader(reader Reader) Reader {
 
 func (r *MergingReader) Read() (*Buffer, error) {
 	if r.leftover != nil {
-		return r.leftover, nil
+		b := r.leftover
+		r.leftover = nil
+		return b, nil
 	}
 
 	b, err := r.reader.Read()