Merge pull request #1801 from ecordell/tr-race

Fix race on error member of TaskRunner
authzed · Mar 14, 2024 · 19a320e · 19a320e
2 parents 33ae2e5 + 869723c
commit 19a320e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/internal/taskrunner/taskrunner.go b/internal/taskrunner/taskrunner.go
@@ -160,5 +160,8 @@ func (tr *TaskRunner) emptyForCancel() {
 // or the parent context to have been canceled.
 func (tr *TaskRunner) Wait() error {
 	tr.wg.Wait()
+
+	tr.lock.Lock()
+	defer tr.lock.Unlock()
 	return tr.err
 }