[前][次][番号順一覧][スレッド一覧]

ruby-changes:45163

From: nobu <ko1@a...>
Date: Fri, 30 Dec 2016 17:01:45 +0900 (JST)
Subject: [ruby-changes:45163] nobu:r57236 (trunk): rational.c: memory leak in gcd

nobu	2016-12-30 17:01:34 +0900 (Fri, 30 Dec 2016)

  New Revision: 57236

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

  Log:
    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]

  Modified files:
    trunk/rational.c
    trunk/test/ruby/test_rational.rb
Index: test/ruby/test_rational.rb
===================================================================
--- test/ruby/test_rational.rb	(revision 57235)
+++ test/ruby/test_rational.rb	(revision 57236)
@@ -880,6 +880,16 @@ class Rational_Test < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/test/ruby/test_rational.rb#L880
     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?)
Index: rational.c
===================================================================
--- rational.c	(revision 57235)
+++ rational.c	(revision 57236)
@@ -261,10 +261,15 @@ rb_gcd_gmp(VALUE x, VALUE y) https://github.com/ruby/ruby/blob/trunk/rational.c#L261
 
     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

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

[前][次][番号順一覧][スレッド一覧]