octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-08 22:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/util: Fix potential data race (#6477)

Browse Source 
Co-authored-by: greatroar <@>
This commit is contained in:
greatroar 2020-03-30 15:10:08 +02:00 committed by GitHub
parent 7709ac33a7
commit d7a257b391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util/utils.go
View File

@ -255,8 +255,12 @@ func (s *service) Stop() {
default: default:
s.cancel() s.cancel()
} }
// Cache s.stopped in a variable while we hold the mutex
// to prevent a data race with Serve's resetting it.
stopped := s.stopped
s.mut.Unlock() s.mut.Unlock()
<-s.stopped <-stopped
} }
func (s *service) Error() error { func (s *service) Error() error {