bug: fix memory corruption for Conn.Next (#649)

Fixes #648 --------- Co-authored-by: zhongweikang <zhongweikang@sfmail.sf-express.com>
panjf2000 · Nov 6, 2024 · cbf7c6a · cbf7c6a
1 parent 2e261de
commit cbf7c6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/connection_unix.go b/connection_unix.go
@@ -325,11 +325,11 @@ func (c *conn) Next(n int) (buf []byte, err error) {
 	}
 	head, tail := c.inboundBuffer.Peek(n)
 	defer c.inboundBuffer.Discard(n) //nolint:errcheck
-	if len(head) >= n {
-		return head[:n], err
-	}
 	c.loop.cache.Reset()
 	c.loop.cache.Write(head)
+	if len(head) >= n {
+		return c.loop.cache.Bytes(), err
+	}
 	c.loop.cache.Write(tail)
 	if inBufferLen >= n {
 		return c.loop.cache.Bytes(), err

diff --git a/connection_windows.go b/connection_windows.go
@@ -164,11 +164,11 @@ func (c *conn) Next(n int) (buf []byte, err error) {
 	}
 	head, tail := c.inboundBuffer.Peek(n)
 	defer c.inboundBuffer.Discard(n) //nolint:errcheck
-	if len(head) >= n {
-		return head[:n], err
-	}
 	c.loop.cache.Reset()
 	c.loop.cache.Write(head)
+	if len(head) >= n {
+		return c.loop.cache.Bytes(), err
+	}
 	c.loop.cache.Write(tail)
 	if inBufferLen >= n {
 		return c.loop.cache.Bytes(), err