From 9f67424dc97e2b99d98b71d08178681f0240ee86 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 12 Sep 2014 02:36:28 +0000 Subject: merge revision(s) 46501,47372,47460: [Backport #10191] * object.c (rb_obj_copy_ivar): extract function to copy instance variables only for T_OBJECT from init_copy. * object.c (rb_obj_copy_ivar): allocate no memory for empty instance variables. [ruby-core:64700] [Bug #10191] * test/ruby/test_object.rb: extend timeout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_object.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'test/ruby') diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index 3bb07dd1b0..11fa1acc02 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -898,4 +898,14 @@ class TestObject < Test::Unit::TestCase err = assert_raise(TypeError){ [].first([42]) } assert_equal 'no implicit conversion of Array into Integer', err.message, issue end + + def test_copied_ivar_memory_leak + bug10191 = '[ruby-core:64700] [Bug #10191]' + assert_no_memory_leak([], <<-"end;", <<-"end;", bug10191, rss: true, timeout: 60) + def (a = Object.new).set; @v = nil; end + num = 500_000 + end; + num.times {a.clone.set} + end; + end end -- cgit v1.2.3