Merge pull request #6419 from ipfs/fix/6418

pin: fix concurrent map access race
ipfs · Jun 6, 2019 · c7dc3c3 · c7dc3c3
2 parents 505eeed + 486f013
commit c7dc3c3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pin/pin.go b/pin/pin.go
@@ -498,11 +498,17 @@ func LoadPinner(d ds.Datastore, dserv, internal ipld.DAGService) (Pinner, error)
 
 // DirectKeys returns a slice containing the directly pinned keys
 func (p *pinner) DirectKeys() []cid.Cid {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+
 	return p.directPin.Keys()
 }
 
 // RecursiveKeys returns a slice containing the recursively pinned keys
 func (p *pinner) RecursiveKeys() []cid.Cid {
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+
 	return p.recursePin.Keys()
 }