nagachika	2014-11-05 00:09:38 +0900 (Wed, 05 Nov 2014)

  New Revision: 48272

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

  Log:
    merge revision(s) r48222: [Backport #10464] [Backport #10465]
    
    * bignum.c (bary_mul_balance_with_mulfunc): Fix free work area
      location.
      [ruby-dev:48723] [Bug #10464]
      [ruby-core:66044] [Bug #10465]
      Reported by Kohji Nishihama.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/bignum.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 48271)
+++ ruby_2_1/ChangeLog	(revision 48272)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Nov  5 00:01:04 2014  Tanaka Akira  <akr@f...>
+
+	* bignum.c (bary_mul_balance_with_mulfunc): Fix free work area
+	  location.
+	  [ruby-dev:48723] [Bug #10464]
+	  [ruby-core:66044] [Bug #10465]
+	  Reported by Kohji Nishihama.
+
 Tue Oct 28 22:30:21 2014  NARUSE, Yui  <naruse@r...>
 
 	* configure.in: remove apple-gcc4.2 from CC candidates.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 48271)
+++ ruby_2_1/version.h	(revision 48272)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2014-10-28"
-#define RUBY_PATCHLEVEL 267
+#define RUBY_RELEASE_DATE "2014-11-05"
+#define RUBY_PATCHLEVEL 268
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 11
+#define RUBY_RELEASE_DAY 5
 
 #include "ruby/version.h"
 
Index: ruby_2_1/bignum.c
===================================================================
--- ruby_2_1/bignum.c	(revision 48271)
+++ ruby_2_1/bignum.c	(revision 48272)
@@ -1650,7 +1650,7 @@ bary_mul_balance_with_mulfunc(BDIGIT *zd https://github.com/ruby/ruby/blob/trunk/ruby_2_1/bignum.c#L1650
             }
             tds = zds + n;
             MEMCPY(wds, zds + n, BDIGIT, xn);
-            mulfunc(tds, tn, xds, xn, yds + n, r, wds-xn, wn-xn);
+            mulfunc(tds, tn, xds, xn, yds + n, r, wds+xn, wn-xn);
             bary_add(zds + n, tn,
                      zds + n, tn,
                      wds, xn);

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48222


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