Skip to content

Fix ConnReadN goroutine leak when stop races cancellation #777

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
Mzack9999 merged 1 commit into from
Sep 14, 2026
Merged

Fix ConnReadN goroutine leak when stop races cancellation #777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion reader/conn_read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,16 @@ func ConnReadN(ctx context.Context, reader io.Reader, N int64) ([]byte, error) {
// connection. The deferred stop cancels this on the normal path, leaving
// the deadline untouched when the read finishes in time.
if rd, ok := reader.(interface{ SetReadDeadline(time.Time) error }); ok {
defer context.AfterFunc(ctx, func() { _ = rd.SetReadDeadline(time.Now()) })()
expire := func() { _ = rd.SetReadDeadline(time.Now()) }
stop := context.AfterFunc(ctx, expire)
defer func() {
// A parent cancellation closes Done before it runs AfterFunc
// callbacks, so stop can win after we observed Done and skip
// expire, leaving the read blocked forever.
if stop() && readErr != nil && ctx.Err() != nil {
expire()
}
}()
}
_, readErr = contextutil.ExecFuncWithTwoReturns(ctx, fn)
// On cancellation report the context error rather than the net timeout
Expand Down
Loading