yujunjun/v2ray-core
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-06-26 21:29:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix buffer leak in mkcp transport protocol (#3347)"

Browse Source 
This reverts commit d2b2f8c1f3d67134d78e79f1b82d7fd7a45cc0af.
This commit is contained in:
Shelikhoo 2025-05-17 21:50:18 +01:00
parent ce14b96d9a
commit d565c48690
No known key found for this signature in database
GPG Key ID: 4C9764E9FE80A3DC
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
transport/internet/kcp/connection.go
View File

@ -390,9 +390,7 @@ func (c *Connection) writeMultiBufferInternal(reader io.Reader) error {
}() }()
var b *buf.Buffer var b *buf.Buffer
defer func() { defer b.Release()
b.Release()
}()
for { for {
for { for {
@ -539,7 +537,6 @@ func (c *Connection) Terminate() {
c.closer.Close() c.closer.Close()
c.sendingWorker.Release() c.sendingWorker.Release()
c.receivingWorker.Release() c.receivingWorker.Release()
c.output.Release()
} }
func (c *Connection) HandleOption(opt SegmentOption) { func (c *Connection) HandleOption(opt SegmentOption) {

9
transport/internet/kcp/output.go
View File

@ -10,7 +10,6 @@ import (
type SegmentWriter interface { type SegmentWriter interface {
Write(seg Segment) error Write(seg Segment) error
Release()
} }
type SimpleSegmentWriter struct { type SimpleSegmentWriter struct {
@ -37,10 +36,6 @@ func (w *SimpleSegmentWriter) Write(seg Segment) error {
return err return err
} }
func (w *SimpleSegmentWriter) Release() {
w.buffer.Release()
}
type RetryableWriter struct { type RetryableWriter struct {
writer SegmentWriter writer SegmentWriter
} }
@ -56,7 +51,3 @@ func (w *RetryableWriter) Write(seg Segment) error {
return w.writer.Write(seg) return w.writer.Write(seg)
}) })
} }
func (w *RetryableWriter) Release() {
w.writer.Release()
}