aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-30 08:01:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-12-30 08:01:34 +0000
commit0696271531f39f950edb70bca372e23f64b458f5 (patch)
tree23fe1a13adbff96531f0897ce05355a7b2430bc5
parent7184474016ad28a31074eeb1349878124e50eb2c (diff)
downloadruby-0696271531f39f950edb70bca372e23f64b458f5.tar.gz
rational.c: memory leak in gcd
* rational.c (rb_gcd_gmp): fix memory leak. patched by KISHIMOTO, Makoto <ksmakoto AT dd.iij4u.or.jp> in [ruby-dev:49934]. [Bug #13089] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--rational.c5
-rw-r--r--test/ruby/test_rational.rb10
2 files changed, 15 insertions, 0 deletions
diff --git a/rational.c b/rational.c
index 439f9673da..f6c49fe516 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?)