lib/model, lib/scanner: Prevent races aborting scans (fixes #6994) (#6997)

2020-09-25 11:27:44 +02:00
parent c390565eef
commit 8452fd2ab4
2 changed files with 9 additions and 0 deletions
@@ -520,6 +520,11 @@ func (f *folder) scanSubdirs(subDirs []string) error {
 		}

 		if err := batch.flushIfFull(); err != nil {
+			// Prevent a race between the scan aborting due to context
+			// cancellation and releasing the snapshot in defer here.
+			scanCancel()
+			for range fchan {
+			}
 			return err
 		}