kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 60421: [Backport #14047]

Browse source 
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
This commit is contained in:
nagachika 2018-03-18 04:03:07 +00:00
parent a8e6617f37
commit 093c6ce7c2
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.4" #define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-18" #define RUBY_RELEASE_DATE "2018-03-18"
#define RUBY_PATCHLEVEL 262 #define RUBY_PATCHLEVEL 263
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

5
win32/win32.c
View file

@ -4958,7 +4958,7 @@ rb_w32_read_reparse_point(const WCHAR *path, rb_w32_reparse_buffer_t *rp,
ret = rp->SymbolicLinkReparseBuffer.PrintNameLength; ret = rp->SymbolicLinkReparseBuffer.PrintNameLength;
*len = ret / sizeof(WCHAR); *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{"; static const WCHAR *volume = L"Volume{";
enum {volume_prefix_len = rb_strlen_lit("\\??\\")}; enum {volume_prefix_len = rb_strlen_lit("\\??\\")};
name = ((char *)rp->MountPointReparseBuffer.PathBuffer + 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) memcmp(name, volume, sizeof(volume) - 1 * sizeof(WCHAR)) == 0)
return -1; return -1;
} }
else {
return -1;
}
*result = name; *result = name;
if (e) { if (e) {
if ((char *)name + ret + sizeof(WCHAR) > (char *)rp + bufsize) if ((char *)name + ret + sizeof(WCHAR) > (char *)rp + bufsize)