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

Co-authored-by: greatroar <@>
2020-03-30 14:10:08 +01:00
parent 7709ac33a7
commit d7a257b391
1 changed files with 5 additions and 1 deletions
@@ -255,8 +255,12 @@ func (s *service) Stop() {
 	default:
 		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.stopped
+	<-stopped
 }

 func (s *service) Error() error {