From f73471e6b491826a7def9474bf57d98cddd58061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E6=89=87=E6=BB=91=E7=BF=94=E7=BF=BC?= Date: Thu, 19 Nov 2026 21:48:04 +0800 Subject: [PATCH] gRPC transport: Pass standard size buffer (#7449) https://github.com/XTLS/Xray-core/pull/7438#issuecomment-7008713358 Fixes https://github.com/XTLS/Xray-core/issues/7369 and https://github.com/XTLS/Xray-core/pull/7424 --------- Co-authored-by: b84330808 Co-authored-by: anonymousmeower --- transport/internet/grpc/encoding/hunkconn.go | 2 +- transport/internet/grpc/encoding/multiconn.go | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/transport/internet/grpc/encoding/hunkconn.go b/transport/internet/grpc/encoding/hunkconn.go index 18262fb95..e0762392f 100644 --- a/transport/internet/grpc/encoding/hunkconn.go +++ b/transport/internet/grpc/encoding/hunkconn.go @@ -91,7 +91,7 @@ func (h *HunkReaderWriter) ReadMultiBuffer() (buf.MultiBuffer, error) { } } - if cap(h.buf) >= buf.Size { + if len(h.buf) == buf.Size { b := h.buf h.index = len(h.buf) return buf.MultiBuffer{buf.NewExisted(b)}, nil diff --git a/transport/internet/grpc/encoding/multiconn.go b/transport/internet/grpc/encoding/multiconn.go index 5a51c929b..8f1dda6ab 100644 --- a/transport/internet/grpc/encoding/multiconn.go +++ b/transport/internet/grpc/encoding/multiconn.go @@ -74,14 +74,10 @@ func (h *MultiHunkReaderWriter) ReadMultiBuffer() (buf.MultiBuffer, error) { continue } - if cap(b) >= buf.Size { + if len(b) == buf.Size { mb = append(mb, buf.NewExisted(b)) } else { - nb := buf.New() - nb.Extend(int32(len(b))) - copy(nb.Bytes(), b) - - mb = append(mb, nb) + mb = buf.MergeBytes(mb, b) } }