Merge pull request #1682 from infastin/fix/sender-deadlock

AlexxIT · web-flow · commit ce02b03a7387 · 2025-04-08T11:26:18.000+03:00
fix(core): potential sender goroutine deadlock
diff --git a/pkg/core/track.go b/pkg/core/track.go
@@ -139,13 +139,13 @@ func (s *Sender) Start() {
 	}
 	s.done = make(chan struct{})
 
-	go func() {
-		// for range on nil chan is OK
-		for packet := range s.buf {
+	// pass buf directly so that it's impossible for buf to be nil
+	go func(buf chan *Packet) {
+		for packet := range buf {
 			s.Output(packet)
 		}
 		close(s.done)
-	}()
+	}(s.buf)
 }
 
 func (s *Sender) Wait() {

Original file line number	Diff line number	Diff line change
`@@ -139,13 +139,13 @@ func (s *Sender) Start() {`
`139`	`139`	`}`
`140`	`140`	`s.done = make(chan struct{})`
`141`	`141`
`142`		`- go func() {`
`143`		`- // for range on nil chan is OK`
`144`		`- for packet := range s.buf {`
	`142`	`+ // pass buf directly so that it's impossible for buf to be nil`
	`143`	`+ go func(buf chan *Packet) {`
	`144`	`+ for packet := range buf {`
`145`	`145`	`s.Output(packet)`
`146`	`146`	`}`
`147`	`147`	`close(s.done)`
`148`		`- }()`
	`148`	`+ }(s.buf)`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`func (s *Sender) Wait() {`