archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-16 05:59:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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_3@62828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-03-18 15:35:03 +00:00
parent f8b4df93d2
commit 5c57eb834a
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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]

2
version.h
View file

@ -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

5
win32/win32.c
View file

@ -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)