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

Fix file pointer management in FileStream. Fixes rejectedsoftware/vibe.d#1684.

Browse source
This commit is contained in:
Sönke Ludwig 2017-02-16 23:37:14 +01:00
parent d07e9258d9
commit 68430a1ea4
No known key found for this signature in database
GPG key ID: D95E8DB493EE314C
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -464,6 +464,7 @@ struct FileStream {
cb => eventDriver.files.read(m_fd, ctx.ptr, dst, mode, cb), cb => eventDriver.files.read(m_fd, ctx.ptr, dst, mode, cb),
cb => eventDriver.files.cancelRead(m_fd) cb => eventDriver.files.cancelRead(m_fd)
); );
ctx.ptr += res[2];
enforce(res[1] == IOStatus.ok, "Failed to read data from disk."); enforce(res[1] == IOStatus.ok, "Failed to read data from disk.");
return res[2]; return res[2];
} }

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

@ -12,16 +12,23 @@ void main()
{ {
auto f = openFile("test.dat", FileMode.createTrunc); auto f = openFile("test.dat", FileMode.createTrunc);
assert(f.size == 0); assert(f.size == 0);
assert(f.tell == 0);
f.write(bytes!(1, 2, 3, 4, 5)); f.write(bytes!(1, 2, 3, 4, 5));
assert(f.size == 5); assert(f.size == 5);
assert(f.tell == 5);
f.seek(0); f.seek(0);
assert(f.tell == 0);
f.write(bytes!(1, 2, 3, 4, 5)); f.write(bytes!(1, 2, 3, 4, 5));
assert(f.size == 5); assert(f.size == 5);
assert(f.tell == 5);
f.write(bytes!(6, 7, 8, 9, 10)); f.write(bytes!(6, 7, 8, 9, 10));
assert(f.size == 10); assert(f.size == 10);
assert(f.tell == 10);
ubyte[5] dst; ubyte[5] dst;
f.seek(2); f.seek(2);
assert(f.tell == 2);
f.read(dst); f.read(dst);
assert(f.tell == 7);
assert(dst[] == bytes!(3, 4, 5, 6, 7)); assert(dst[] == bytes!(3, 4, 5, 6, 7));
f.close(); f.close();