Skip to content

Fix shadowsocks2022 memory leak #5166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuhan6665 merged 2 commits into from
Oct 6, 2025
Merged

Fix shadowsocks2022 memory leak #5166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bec31a
Fix ss2022 gouroutine leak
Fangliding Sep 18, 2025
5f86aaf
ErrReadTimeout
Fangliding Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion common/singbridge/pipe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"context"
"io"
"net"
"time"

"github.com/sagernet/sing/common/bufio"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/transport"
)
Expand Down Expand Up @@ -33,8 +35,26 @@ func (w *PipeConnWrapper) Close() error {
return nil
}

// This Read implemented a timeout to avoid goroutine leak.
// as a temporarily solution
func (w *PipeConnWrapper) Read(b []byte) (n int, err error) {
return w.R.Read(b)
type readResult struct {
n int
err error
}
c := make(chan readResult, 1)
go func() {
n, err := w.R.Read(b)
c <- readResult{n: n, err: err}
}()
select {
case result := <-c:
return result.n, result.err
case <-time.After(300 * time.Second):
common.Close(w.R)
common.Interrupt(w.R)
return 0, buf.ErrReadTimeout
}
}

func (w *PipeConnWrapper) Write(p []byte) (n int, err error) {
Expand Down
Loading