archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 18:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 35081: [Backport #6605]

Browse source 
* bignum.c (rb_big_pow): estimate result bit size more precisely.
	  [ruby-core:30735][Feature #3429]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-06-26 19:21:02 +00:00
parent 0659c5351e
commit 49dbacf73e
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jun 27 04:20:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_pow): estimate result bit size more precisely.
[ruby-core:30735][Feature #3429]
Tue Jun 26 20:36:53 2012 Tanaka Akira <akr@fsij.org>
* lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits.

7
bignum.c
View file

@ -3079,10 +3079,11 @@ rb_big_pow(VALUE x, VALUE y)
else {
VALUE z = 0;
SIGNED_VALUE mask;
const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
const long xlen = RBIGNUM_LEN(x) - 1;
const long xbits = ffs(RBIGNUM_DIGITS(x)[xlen]) + SIZEOF_BDIGITS*BITSPERDIG*xlen;
const long BIGLEN_LIMIT = BITSPERDIG*1024*1024;
if ((RBIGNUM_LEN(x) > BIGLEN_LIMIT) ||
(RBIGNUM_LEN(x) > BIGLEN_LIMIT / yy)) {
if ((xbits > BIGLEN_LIMIT) || (xbits * yy > BIGLEN_LIMIT)) {
rb_warn("in a**b, b may be too big");
d = (double)yy;
break;

3
test/ruby/test_bignum.rb
View file

@ -299,6 +299,9 @@ class TestBignum < Test::Unit::TestCase
### rational changes the behavior of Bignum#**
#assert_raise(TypeError) { T32**"foo" }
assert_raise(TypeError, ArgumentError) { T32**"foo" }
feature3429 = '[ruby-core:30735]'
assert_instance_of(Bignum, (2 ** 7830457), feature3429)
end
def test_and

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 239
#define RUBY_PATCHLEVEL 240
#define RUBY_RELEASE_DATE "2012-06-26"
#define RUBY_RELEASE_DATE "2012-06-27"
#define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 26
#define RUBY_RELEASE_DAY 27
#include "ruby/version.h"