kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 55729: [Backport #12611]

Browse source 
* 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
This commit is contained in:
usa 2016-08-16 04:56:04 +00:00
parent be4b713d53
commit eee441fdfe
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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

2
string.c
View file

@ -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);

2
version.h
View file

@ -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

2
vm.c
View file

@ -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);
}
}