SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-05 12:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix concurrent access on task returnError

Browse source
This commit is contained in:
世界 2023-09-30 21:37:12 +08:00
parent 63b82af61f
commit e727641a98
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
common/task/task.go
View file

@ -87,16 +87,18 @@ func (g *Group) RunContextList(contextList []context.Context) error {
} }
selectedContext, upstreamErr := common.SelectContext(append([]context.Context{taskCancelContext}, contextList...)) selectedContext, upstreamErr := common.SelectContext(append([]context.Context{taskCancelContext}, contextList...))
if selectedContext != 0 {
returnError = E.Append(returnError, upstreamErr, func(err error) error {
return E.Cause(err, "upstream")
})
}
if g.cleanup != nil { if g.cleanup != nil {
g.cleanup() g.cleanup()
} }
<-taskContext.Done() <-taskContext.Done()
if selectedContext != 0 {
returnError = E.Append(returnError, upstreamErr, func(err error) error {
return E.Cause(err, "upstream")
})
}
return returnError return returnError
} }