Merge pull request #35 from sudo-bmitch/pr-race-index-get

Fix a data race on the IndexGet calls
olareg · Dec 25, 2023 · 54343bb · 54343bb
2 parents 357bcc4 + a2ab75e
commit 54343bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/internal/store/dir.go b/internal/store/dir.go
@@ -107,7 +107,9 @@ func (d *dir) RepoGet(repoStr string) (Repo, error) {
 
 // IndexGet returns the current top level index for a repo.
 func (dr *dirRepo) IndexGet() (types.Index, error) {
-	err := dr.repoLoad(false, false)
+	dr.mu.Lock()
+	defer dr.mu.Unlock()
+	err := dr.repoLoad(false, true)
 	return dr.index, err
 }
 

diff --git a/internal/store/mem.go b/internal/store/mem.go
@@ -72,6 +72,8 @@ func (m *mem) RepoGet(repoStr string) (Repo, error) {
 
 // IndexGet returns the current top level index for a repo.
 func (mr *memRepo) IndexGet() (types.Index, error) {
+	mr.mu.Lock()
+	defer mr.mu.Unlock()
 	return mr.index, nil
 }