debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix bogus file access denied error after listDirectory calls on Windows.

Browse source 
Makes sure that `FindClose` gets called before `listDirectory` returns to avoid a race-condition, where a successive modification of the directory fails with "access denied".
This commit is contained in:
Sönke Ludwig 2020-12-01 19:23:05 +01:00
parent 3d1be3b3cb
commit a9ba6d98cb
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/vibe/core/file.d
View file

@ -375,7 +375,7 @@ void listDirectory(string path, scope bool delegate(FileInfo info) @safe del)
auto ch = createChannel!S(); auto ch = createChannel!S();
TaskSettings ts; TaskSettings ts;
ts.priority = 10 * Task.basePriority; ts.priority = 10 * Task.basePriority;
runWorkerTaskH(ioTaskSettings, (string path, Channel!S ch) nothrow { auto t = runWorkerTaskH(ioTaskSettings, (string path, Channel!S ch) nothrow {
scope (exit) ch.close(); scope (exit) ch.close();
try { try {
foreach (DirEntry ent; dirEntries(path, SpanMode.shallow)) { foreach (DirEntry ent; dirEntries(path, SpanMode.shallow)) {
@ -389,6 +389,11 @@ void listDirectory(string path, scope bool delegate(FileInfo info) @safe del)
} }
}, path, ch); }, path, ch);
scope (exit) {
t.interrupt();
t.joinUninterruptible();
}
S itm; S itm;
while (ch.tryConsumeOne(itm)) { while (ch.tryConsumeOne(itm)) {
if (itm.error.length) if (itm.error.length)