Skip to content

net: prevent defer misuse in for loops #75035

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+5 −2
Open

net: prevent defer misuse in for loops #75035

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24ff1bb
net: prevent defer misuse in for loops
Aug 15, 2025
05bd55e
net: fix dialSerial returns a non-first error
Aug 15, 2025
3a40c12
net: avoid creating dialAddr for defer in for loops
Aug 27, 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
7 changes: 5 additions & 2 deletions src/net/dial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,8 @@ func (sd *sysDialer) dialSerial(ctx context.Context, ras addrList) (Conn, error)
}

dialCtx := ctx
var cancel context.CancelFunc

if deadline, hasDeadline := ctx.Deadline(); hasDeadline {
partialDeadline, err := partialDeadline(time.Now(), deadline, len(ras)-i)
if err != nil {
Expand All @@ -747,13 +749,14 @@ func (sd *sysDialer) dialSerial(ctx context.Context, ras addrList) (Conn, error)
break
}
if partialDeadline.Before(deadline) {
var cancel context.CancelFunc
dialCtx, cancel = context.WithDeadline(ctx, partialDeadline)
defer cancel()
}
}

c, err := sd.dialSingle(dialCtx, ra)
if cancel != nil {
cancel()
}
if err == nil {
return c, nil
}
Expand Down