From b232b1bbeb88bae6a855aa8fee2dafec66dcb6f9 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 11 Mar 2017 14:20:51 +0000 Subject: merge revision(s) 57236: [Backport #13089] rational.c: memory leak in gcd * rational.c (rb_gcd_gmp): fix memory leak. patched by KISHIMOTO, Makoto in [ruby-dev:49934]. [Bug #13089] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- rational.c | 5 +++++ test/ruby/test_rational.rb | 10 ++++++++++ version.h | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/rational.c b/rational.c index 2fd020429d..0b7a88490d 100644 --- a/rational.c +++ b/rational.c @@ -261,10 +261,15 @@ rb_gcd_gmp(VALUE x, VALUE y) mpz_gcd(mz, mx, my); + mpz_clear(mx); + mpz_clear(my); + zn = (mpz_sizeinbase(mz, 16) + SIZEOF_BDIGIT*2 - 1) / (SIZEOF_BDIGIT*2); z = rb_big_new(zn, 1); mpz_export(BIGNUM_DIGITS(z), &count, -1, sizeof(BDIGIT), 0, nails, mz); + mpz_clear(mz); + return rb_big_norm(z); } #endif diff --git a/test/ruby/test_rational.rb b/test/ruby/test_rational.rb index 9651f46f01..e40de141b5 100644 --- a/test/ruby/test_rational.rb +++ b/test/ruby/test_rational.rb @@ -880,6 +880,16 @@ class Rational_Test < Test::Unit::TestCase assert_equal(1152921470247108503, 1073741789.lcm(1073741827)) end + def test_gcd_no_memory_leak + assert_no_memory_leak([], "#{<<-"begin;"}", "#{<<-"end;"}", limit: 1.2, rss: true) + x = (1<<121) + 1 + y = (1<<99) + 1 + 1000.times{x.gcd(y)} + begin; + 100.times {1000.times{x.gcd(y)}} + end; + end + def test_supp assert_predicate(1, :real?) assert_predicate(1.1, :real?) diff --git a/version.h b/version.h index 6808982beb..2aca878229 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-11" -#define RUBY_PATCHLEVEL 13 +#define RUBY_PATCHLEVEL 14 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3