diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 15:35:03 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 15:35:03 +0000 |
| commit | 5c57eb834adb007c901b2fec1409b64d19965a2c (patch) | |
| tree | 1b764ab02f750451f7067d9a11ef68c0f888ecbf | |
| parent | f8b4df93d22930ad5ca4f73ea7740ea253d4859b (diff) | |
merge revision(s) 60421: [Backport #14047]
win32.c: unknown reparse tags
* win32/win32.c (rb_w32_read_reparse_point): skip unknown reparse
tags. [ruby-core:83539] [Bug #14047]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/win32.c | 5 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Mar 19 00:34:38 2018 Nobuyoshi Nakada <nobu@ruby-lang.org> + + win32.c: unknown reparse tags + + * win32/win32.c (rb_w32_read_reparse_point): skip unknown reparse tags. + [Bug #14047] + Mon Mar 19 00:32:31 2018 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/test_lazy_enumerator.rb: test for [Bug #14082] @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.7" #define RUBY_RELEASE_DATE "2018-03-19" -#define RUBY_PATCHLEVEL 428 +#define RUBY_PATCHLEVEL 429 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 diff --git a/win32/win32.c b/win32/win32.c index 72f0797988..3f189b3a6c 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4840,7 +4840,7 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp, ret = rp->SymbolicLinkReparseBuffer.PrintNameLength; *len = ret / sizeof(WCHAR); } - else { /* IO_REPARSE_TAG_MOUNT_POINT */ + else if (rp->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT) { static const WCHAR *volume = L"Volume{"; /* +4/-4 means to drop "\??\" */ name = ((char *)rp->MountPointReparseBuffer.PathBuffer + @@ -4853,6 +4853,9 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp, memcmp(name, volume, sizeof(volume) - 1 * sizeof(WCHAR)) == 0) return -1; } + else { + return -1; + } *result = name; if (e) { if ((char *)name + ret + sizeof(WCHAR) > (char *)rp + bufsize) |