diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-22 06:19:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-22 06:19:03 +0000 |
| commit | a815b56d84e1876c5f6e5fc9f4b3bc46a1a3cfb3 (patch) | |
| tree | b5e4c4984ab8ec16857a927e71ddb33cc406fb37 | |
| parent | 38302ca7195981b7f4994526378d9c90320d350f (diff) | |
| download | ruby-a815b56d84e1876c5f6e5fc9f4b3bc46a1a3cfb3.tar.gz | |
win32.c: check error of SetFilePointer
* win32/win32.c (setup_overlapped): check the error code in addition
to the result of SetFilePointer() to determine if an error occurred,
because INVALID_SET_FILE_POINTER is a valid value.
[ruby-core:55098] [Bug #8431]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 11 | ||||
| -rw-r--r-- | win32/win32.c | 7 |
3 files changed, 22 insertions, 3 deletions
@@ -1,4 +1,9 @@ -Wed May 22 15:17:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed May 22 15:18:59 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/win32.c (setup_overlapped): check the error code in addition + to the result of SetFilePointer() to determine if an error occurred, + because INVALID_SET_FILE_POINTER is a valid value. + [ruby-core:55098] [Bug #8431] * win32/win32.c (setup_overlapped, finish_overlapped): extract from rb_w32_read() and rb_w32_write(). diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index d44dd31e71..ca741f8a23 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -2673,4 +2673,15 @@ End IO.select(tempfiles) }, bug8080 end + + def test_seek_32bit_boundary + bug8431 = '[ruby-core:55098] [Bug #8431]' + make_tempfile {|t| + assert_ruby_status(["-e", <<-"end;", t.path], "", bug8431) + f = ARGF.to_io + f.seek(0xffff_ffff) + f.read(1) + end; + } + end end diff --git a/win32/win32.c b/win32/win32.c index 74d13960bc..b7eb4c62f2 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -6028,8 +6028,11 @@ setup_overlapped(OVERLAPPED *ol, int fd) #define INVALID_SET_FILE_POINTER ((DWORD)-1) #endif if (low == INVALID_SET_FILE_POINTER) { - errno = map_errno(GetLastError()); - return -1; + DWORD err = GetLastError(); + if (err != NO_ERROR) { + errno = map_errno(err); + return -1; + } } ol->Offset = low; ol->OffsetHigh = high; |