From f2edb94ee71a8ba34e31f7a30482e2255ecb4acf Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 11 Aug 2015 16:03:42 +0000 Subject: merge revision(s) 51532: [Backport #11433] * 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 --- ChangeLog | 5 +++++ array.c | 2 +- version.h | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9ce96f10e..7fe259ef44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 12 00:54:29 2015 Nobuyoshi Nakada + + * array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N + already multiplies element size. + Tue Aug 11 01:51:53 2015 CHIKANAGA Tomoyuki * lib/timeout.rb (ExitException): leave Timeout::ExitException as an diff --git a/array.c b/array.c index 82a4d359ab..c255e096ed 100644 --- a/array.c +++ b/array.c @@ -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); diff --git a/version.h b/version.h index 4f82676308..31b523cd6b 100644 --- a/version.h +++ b/version.h @@ -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" -- cgit v1.2.3