usa	2016-08-16 13:56:04 +0900 (Tue, 16 Aug 2016)

  New Revision: 55925

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

  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_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/string.c
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm.c
Index: ruby_2_2/vm.c
===================================================================
--- ruby_2_2/vm.c	(revision 55924)
+++ ruby_2_2/vm.c	(revision 55925)
@@ -245,7 +245,7 @@ vm_set_main_stack(rb_thread_t *th, VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_2/vm.c#L245
 
     /* save binding */
     GetISeqPtr(iseqval, iseq);
-    if (bind && iseq->local_size > 0) {
+    if (iseq->local_size > 0) {
 	bind->env = rb_vm_make_env_object(th, th->cfp);
     }
 }
Index: ruby_2_2/string.c
===================================================================
--- ruby_2_2/string.c	(revision 55924)
+++ ruby_2_2/string.c	(revision 55925)
@@ -6523,7 +6523,7 @@ rb_str_split_m(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_2/string.c#L6523
 		    beg = start;
 		}
 		else {
-                    if (ptr+start == ptr+len)
+                    if (start == len)
                         start++;
                     else
                         start += rb_enc_fast_mbclen(ptr+start,ptr+len,enc);
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55924)
+++ ruby_2_2/version.h	(revision 55925)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 353
+#define RUBY_PATCHLEVEL 354
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55924)
+++ ruby_2_2/ChangeLog	(revision 55925)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Aug 16 13:52:42 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* vm.c (vm_set_main_stack): remove unnecessary check.  toplevel
+	  binding must be initialized.  [Bug #12611] (N1)
+
+	* string.c (rb_str_split_m): simplify the condition.
+	  [Bug #12611](N4)
+
 Tue Aug 16 13:42:42 2016  Naohisa Goto  <ngotogenome@g...>
 
 	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time

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


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