diff options
-rw-r--r-- | bignum.c | 10 | ||||
-rw-r--r-- | test/ruby/test_integer.rb | 3 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 16 insertions, 5 deletions
@@ -6875,7 +6875,15 @@ estimate_initial_sqrt(VALUE *xp, const size_t xn, const BDIGIT *nds, size_t len) rshift /= 2; rshift += (2-(len&1))*BITSPERDIG/2; if (rshift >= 0) { - d <<= rshift; + if (nlz((BDIGIT)d) + rshift >= BITSPERDIG) { + /* (d << rshift) does cause overflow. + * example: Integer.sqrt(0xffff_ffff_ffff_ffff ** 2) + */ + d = ~(BDIGIT_DBL)0; + } + else { + d <<= rshift; + } } BDIGITS_ZERO(xds, xn-2); bdigitdbl2bary(&xds[xn-2], 2, d); diff --git a/test/ruby/test_integer.rb b/test/ruby/test_integer.rb index 69347b6b11..0f289d8ed9 100644 --- a/test/ruby/test_integer.rb +++ b/test/ruby/test_integer.rb @@ -595,6 +595,9 @@ class TestInteger < Test::Unit::TestCase failures << n unless root*root <= n && (root+1)*(root+1) > n end assert_empty(failures, bug13440) + + x = 0xffff_ffff_ffff_ffff + assert_equal(x, Integer.sqrt(x ** 2), "[ruby-core:95453]") end def test_fdiv @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.6.7" -#define RUBY_RELEASE_DATE "2021-01-31" -#define RUBY_PATCHLEVEL 153 +#define RUBY_RELEASE_DATE "2021-02-28" +#define RUBY_PATCHLEVEL 154 #define RUBY_RELEASE_YEAR 2021 -#define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 28 #include "ruby/version.h" |