diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 04:03:07 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 04:03:07 +0000 |
| commit | 093c6ce7c24aadc3c439ce3ae507d7309304e893 (patch) | |
| tree | 2f1220b93aa054f2477dbc6a5a0efd6742435f49 | |
| parent | a8e6617f379c6ba814a6f0754c3164d4679668b8 (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_4@62804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/win32.c | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-03-18" -#define RUBY_PATCHLEVEL 262 +#define RUBY_PATCHLEVEL 263 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 diff --git a/win32/win32.c b/win32/win32.c index 62801dae71..7e8afb2ddc 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4958,7 +4958,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{"; enum {volume_prefix_len = rb_strlen_lit("\\??\\")}; name = ((char *)rp->MountPointReparseBuffer.PathBuffer + @@ -4971,6 +4971,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) |