nagachika	2015-03-18 02:42:46 +0900 (Wed, 18 Mar 2015)

  New Revision: 49997

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

  Log:
    merge revision(s) r48690: [Backport #10563]
    
    * win32/win32.c (w32_spawn): `v2` is used not only for `shell` but also
      `cmd`, so must not free before using `cmd`.
      [ruby-core:66648] [Bug #10563]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/version.h
    branches/ruby_2_1/win32/win32.c
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49996)
+++ ruby_2_1/ChangeLog	(revision 49997)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Mar 18 02:42:37 2015  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (w32_spawn): `v2` is used not only for `shell` but also
+	  `cmd`, so must not free before using `cmd`.
+	  [ruby-core:66648] [Bug #10563]
+
 Wed Mar 18 02:40:18 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/win32.c (constat_reset): do nothing on non-standard
Index: ruby_2_1/win32/win32.c
===================================================================
--- ruby_2_1/win32/win32.c	(revision 49996)
+++ ruby_2_1/win32/win32.c	(revision 49997)
@@ -1320,9 +1320,9 @@ w32_spawn(int mode, const char *cmd, con https://github.com/ruby/ruby/blob/trunk/ruby_2_1/win32/win32.c#L1320
     }
 
     if (!e && shell && !(wshell = mbstr_to_wstr(cp, shell, -1, NULL))) e = E2BIG;
-    if (v2) ALLOCV_END(v2);
     if (cmd_sep) *cmd_sep = sep;
     if (!e && cmd && !(wcmd = mbstr_to_wstr(cp, cmd, -1, NULL))) e = E2BIG;
+    if (v2) ALLOCV_END(v2);
     if (v) ALLOCV_END(v);
 
     if (!e) {
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49996)
+++ ruby_2_1/version.h	(revision 49997)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-18"
-#define RUBY_PATCHLEVEL 318
+#define RUBY_PATCHLEVEL 319
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48690


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