github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 09:41:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vfs: fix potential data race - Fixes #6962

Browse Source 
This fixes a data race that was found by static analysis.
This commit is contained in:
Nick Craig-Wood 2023-04-20 17:29:07 +01:00
parent 72e624c5e4
commit e82db0b7d5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vfs/read.go
View File

@ -7,6 +7,7 @@ import (
"io" "io"
"os" "os"
"sync" "sync"
"sync/atomic"
"time" "time"
"github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs"
@ -222,7 +223,7 @@ func waitSequential(what string, remote string, cond *sync.Cond, maxWait time.Du
var ( var (
timeout = time.NewTimer(maxWait) timeout = time.NewTimer(maxWait)
done = make(chan struct{}) done = make(chan struct{})
abort = false abort = int32(0)
) )
go func() { go func() {
select { select {
@ -231,14 +232,14 @@ func waitSequential(what string, remote string, cond *sync.Cond, maxWait time.Du
// cond.Broadcast. NB cond.L == mu // cond.Broadcast. NB cond.L == mu
cond.L.Lock() cond.L.Lock()
// set abort flag and give all the waiting goroutines a kick on timeout // set abort flag and give all the waiting goroutines a kick on timeout
abort = true atomic.StoreInt32(&abort, 1)
fs.Debugf(remote, "aborting in-sequence %s wait, off=%d", what, off) fs.Debugf(remote, "aborting in-sequence %s wait, off=%d", what, off)
cond.Broadcast() cond.Broadcast()
cond.L.Unlock() cond.L.Unlock()
case <-done: case <-done:
} }
}() }()
for *poff != off && !abort { for *poff != off && atomic.LoadInt32(&abort) == 0 {
fs.Debugf(remote, "waiting for in-sequence %s to %d for %v", what, off, maxWait) fs.Debugf(remote, "waiting for in-sequence %s to %d for %v", what, off, maxWait)
cond.Wait() cond.Wait()
} }