Commit a1a69f24c846fdd8a7682216c383df53963b5b3b | zig

author	Jimmi Holst Christensen <jhc@dismail.de> 2018-01-19 22:05:56+01:00
committer	Jimmi Holst Christensen <jhc@dismail.de> 2018-01-19 22:05:56+01:00
log	a1a69f24c846fdd8a7682216c383df53963b5b3b
tree	77d1d6cefa80907b554f70e61e75384f06a07c4f
parent	61497893d312e9e9bf5dd0c3d6fe232091ce8045

1 files changed, 9 insertions(+), 3 deletions(-)

std/io.zig+9-3

 @@ -48,6 +48,7 @@ error PathNotFound;
 error OutOfMemory;
 error Unseekable;
 error EndOfFile;
+error FilePosLargerThanPointerRange;
 pub fn getStdErr() -> %File {
     const handle = if (is_windows)
 @@ -266,8 +267,8 @@ pub const File = struct {
                 return result;
             },
             Os.windows => {
-                var pos : usize = undefined;
+                var pos : system.LARGE_INTEGER = undefined;
-                if (system.SetFilePointerEx(self.handle, 0, @ptrCast(system.PLARGE_INTEGER, &pos), system.FILE_CURRENT) == 0) {
+                if (system.SetFilePointerEx(self.handle, 0, &pos, system.FILE_CURRENT) == 0) {
                     const err = system.GetLastError();
                     return switch (err) {
                         system.ERROR.INVALID_PARAMETER => error.BadFd,
 @@ -275,7 +276,12 @@ pub const File = struct {
                     };
                 }
-                return pos;
+                assert(pos >= 0);
+                if (pos > @maxValue(usize)) {
+                    return error.FilePosLargerThanPointerRange;
+                }
+                return usize(pos);
             },
             else => @compileError("unsupported OS"),
         }