Graceful feature: Fix concurrent security bug

andeya · Mar 8, 2018 · d180cc7 · d180cc7
1 parent 1ef81d2
commit d180cc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/graceful.go b/graceful.go
@@ -45,13 +45,14 @@ func deletePeer(p *peer) {
 }
 
 func shutdown() error {
-	peers.rwmu.Lock()
-	defer peers.rwmu.Unlock()
+	peers.rwmu.RLock()
 	var (
+		list  = peers.list
 		count int
-		errCh = make(chan error, len(peers.list))
+		errCh = make(chan error, len(list))
 	)
-	for p := range peers.list {
+	peers.rwmu.RUnlock()
+	for p := range list {
 		count++
 		go func(peer *peer) {
 			errCh <- peer.Close()

diff --git a/peer.go b/peer.go
@@ -398,7 +398,7 @@ func (p *peer) Close() (err error) {
 		}
 	}()
 	close(p.closeCh)
-	delete(peers.list, p)
+	deletePeer(p)
 	var (
 		count int
 		errCh = make(chan error, 10)