fix race in foundRefs.claim() (hound-search#335)

yelizariev · May 4, 2020 · 9f24b0f · 9f24b0f
1 parent 91e3b88
commit 9f24b0f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/searcher/searcher.go b/searcher/searcher.go
@@ -53,6 +53,7 @@ type limiter chan bool
 type foundRefs struct {
 	refs    []*index.IndexRef
 	claimed map[*index.IndexRef]bool
+	lock    sync.Mutex
 }
 
 func makeLimiter(n int) limiter {
@@ -85,6 +86,9 @@ func (r *foundRefs) find(url, rev string) *index.IndexRef {
  * collected at the end of startup.
  */
 func (r *foundRefs) claim(ref *index.IndexRef) {
+	r.lock.Lock()
+	defer r.lock.Unlock()
+
 	r.claimed[ref] = true
 }
 
@@ -93,6 +97,9 @@ func (r *foundRefs) claim(ref *index.IndexRef) {
  * found in the dbpath but were not claimed during startup.
  */
 func (r *foundRefs) removeUnclaimed() error {
+	r.lock.Lock()
+	defer r.lock.Unlock()
+
 	for _, ref := range r.refs {
 		if r.claimed[ref] {
 			continue