ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent infinite-loop on EOF

Browse Source
This commit is contained in:
Colin Davidson
2023-05-06 17:52:08 -07:00
parent 291111e626
commit b0eda47b26
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/file_windows.odin
+4 -5
View File
@@ -243,11 +243,6 @@ pread :: proc(fd: Handle, data: []byte, offset: i64) -> (int, Errno) {
if !win32.ReadFile(h, raw_data(buf), u32(len(buf)), &done, &o) { if !win32.ReadFile(h, raw_data(buf), u32(len(buf)), &done, &o) {
e = Errno(win32.GetLastError()) e = Errno(win32.GetLastError())
done = 0 done = 0
// this makes behavior between *nix and windows consistent when EOF is hit
if e == ERROR_EOF {
e = 0
}
} }
return int(done), e return int(done), e
} }
@@ -292,6 +287,10 @@ read_at :: proc(fd: Handle, data: []byte, offset: i64) -> (n: int, err: Errno) {
b, offset := data, offset b, offset := data, offset
for len(b) > 0 { for len(b) > 0 {
m, e := pread(fd, b, offset) m, e := pread(fd, b, offset)
if e == ERROR_EOF {
err = 0
break
}
if e != 0 { if e != 0 {
err = e err = e
break break