nagachika	2016-08-18 23:17:22 +0900 (Thu, 18 Aug 2016)

  New Revision: 55959

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

  Log:
    merge revision(s) 55729: [Backport #12611]
    
    * vm.c (vm_set_main_stack): remove unnecessary check.  toplevel
      binding must be initialized.  [Bug #12611] (N1)
    
    * win32/win32.c (w32_symlink): fix return type.  [Bug #12611] (N3)
    
    * string.c (rb_str_split_m): simplify the condition.
      [Bug #12611](N4)

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/string.c
    branches/ruby_2_3/version.h
    branches/ruby_2_3/vm.c
    branches/ruby_2_3/win32/win32.c
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55958)
+++ ruby_2_3/version.h	(revision 55959)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-08-18"
-#define RUBY_PATCHLEVEL 170
+#define RUBY_PATCHLEVEL 171
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_3/vm.c
===================================================================
--- ruby_2_3/vm.c	(revision 55958)
+++ ruby_2_3/vm.c	(revision 55959)
@@ -376,7 +376,7 @@ vm_set_main_stack(rb_thread_t *th, const https://github.com/ruby/ruby/blob/trunk/ruby_2_3/vm.c#L376
     vm_set_eval_stack(th, iseq, 0, &env->block);
 
     /* save binding */
-    if (bind && iseq->body->local_size > 0) {
+    if (iseq->body->local_size > 0) {
 	bind->env = vm_make_env_object(th, th->cfp);
     }
 }
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55958)
+++ ruby_2_3/ChangeLog	(revision 55959)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Aug 18 23:07:29 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm.c (vm_set_main_stack): remove unnecessary check.  toplevel
+	  binding must be initialized.  [Bug #12611] (N1)
+
+	* win32/win32.c (w32_symlink): fix return type.  [Bug #12611] (N3)
+
+	* string.c (rb_str_split_m): simplify the condition.
+	  [Bug #12611](N4)
+
 Thu Aug 18 23:06:20 2016  Kouhei Sutou  <kou@c...>
 
 	* lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong
Index: ruby_2_3/win32/win32.c
===================================================================
--- ruby_2_3/win32/win32.c	(revision 55958)
+++ ruby_2_3/win32/win32.c	(revision 55959)
@@ -4930,7 +4930,7 @@ w32_symlink(UINT cp, const char *src, co https://github.com/ruby/ruby/blob/trunk/ruby_2_3/win32/win32.c#L4930
     DWORD flag = 0;
     BOOLEAN ret;
 
-    typedef DWORD (WINAPI *create_symbolic_link_func)(WCHAR*, WCHAR*, DWORD);
+    typedef BOOLEAN (WINAPI *create_symbolic_link_func)(WCHAR*, WCHAR*, DWORD);
     static create_symbolic_link_func create_symbolic_link =
 	(create_symbolic_link_func)-1;
 
Index: ruby_2_3/string.c
===================================================================
--- ruby_2_3/string.c	(revision 55958)
+++ ruby_2_3/string.c	(revision 55959)
@@ -6928,7 +6928,7 @@ rb_str_split_m(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_3/string.c#L6928
 		    beg = start;
 		}
 		else {
-                    if (ptr+start == ptr+len)
+                    if (start == len)
                         start++;
                     else
                         start += rb_enc_fast_mbclen(ptr+start,ptr+len,enc);

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55729


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