nagachika	2015-08-12 01:03:42 +0900 (Wed, 12 Aug 2015)

  New Revision: 51535

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

  Log:
    merge revision(s) 51532: [Backport #11433]
    
    * array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N
      already multiplies element size.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/array.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/array.c
===================================================================
--- ruby_2_2/array.c	(revision 51534)
+++ ruby_2_2/array.c	(revision 51535)
@@ -5097,7 +5097,7 @@ rb_ary_repeated_permutation(VALUE ary, V https://github.com/ruby/ruby/blob/trunk/ruby_2_2/array.c#L5097
     }
     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);
 
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 51534)
+++ ruby_2_2/ChangeLog	(revision 51535)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Aug 12 00:54:29 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* lib/timeout.rb (ExitException): leave Timeout::ExitException as an
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51534)
+++ ruby_2_2/version.h	(revision 51535)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 

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


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