TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential goroutine leak in syncs/watchdog.go

Browse Source 
Depending on how the preemption will occur, in some scenarios sendc
would have blocked indefinitely even after cancelling the context.

Fixes #10315

Signed-off-by: Uri Gorelik <uri.gore@gmail.com>
This commit is contained in:
Uri Gorelik 2023-11-18 08:33:47 -05:00 committed by Denton Gentry
parent e7cad78b00
commit b88929edf8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
syncs/watchdog.go
View File

@ -29,7 +29,10 @@ func Watch(ctx context.Context, mu sync.Locker, tick, max time.Duration) chan ti
// Drop values written after c is closed. // Drop values written after c is closed.
return return
} }
c <- d select {
case c <- d:
case <-ctx.Done():
}
} }
closec := func() { closec := func() {
closemu.Lock() closemu.Lock()