diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 04:56:04 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 04:56:04 +0000 |
commit | eee441fdfe9941d13aff0333effd0c6f6ced346f (patch) | |
tree | 3a6db25e7e76358463f3762830d17f2ca1f1c6ea | |
parent | be4b713d53381cbaec2a9b3aeef0113eeacc172b (diff) |
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)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm.c | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Tue Aug 16 13:52:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@gmail.com> * thread.c (rb_wait_for_single_fd): Clean up fds.revents every time @@ -6523,7 +6523,7 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) beg = start; } else { - if (ptr+start == ptr+len) + if (start == len) start++; else start += rb_enc_fast_mbclen(ptr+start,ptr+len,enc); @@ -1,6 +1,6 @@ #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 @@ -245,7 +245,7 @@ vm_set_main_stack(rb_thread_t *th, VALUE iseqval) /* 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); } } |