nagachika	2018-03-18 13:03:07 +0900 (Sun, 18 Mar 2018)

  New Revision: 62804

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62804

  Log:
    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]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/version.h
    branches/ruby_2_4/win32/win32.c
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 62803)
+++ ruby_2_4/version.h	(revision 62804)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #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
Index: ruby_2_4/win32/win32.c
===================================================================
--- ruby_2_4/win32/win32.c	(revision 62803)
+++ ruby_2_4/win32/win32.c	(revision 62804)
@@ -4958,7 +4958,7 @@ rb_w32_read_reparse_point(const WCHAR *p https://github.com/ruby/ruby/blob/trunk/ruby_2_4/win32/win32.c#L4958
 	    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 *p https://github.com/ruby/ruby/blob/trunk/ruby_2_4/win32/win32.c#L4971
 		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)
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 62803)
+++ ruby_2_4	(revision 62804)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r60421

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/