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) 51532: [Backport #11433]

Browse source 
* array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N
	  already multiplies element size.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-08-11 16:03:42 +00:00
parent 4027090682
commit f2edb94ee7
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Aug 12 00:54:29 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N
already multiplies element size.
Tue Aug 11 01:51:53 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/timeout.rb (ExitException): leave Timeout::ExitException as an

2
array.c
View file

@ -5097,7 +5097,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
}
else { /* this is the general case */
volatile VALUE t0;
long *p = ALLOCV_N(long, t0, r * sizeof(long));
long *p = ALLOCV_N(long, t0, r);
VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
RBASIC_CLEAR_CLASS(ary0);

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-08-11"
#define RUBY_PATCHLEVEL 156
#define RUBY_RELEASE_DATE "2015-08-12"
#define RUBY_PATCHLEVEL 157
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 11
#define RUBY_RELEASE_DAY 12
#include "ruby/version.h"