merges r30641 from trunk into ruby_1_9_2.

--
* error.c (rb_invalid_str): prevent intermediate variable from GC.
  [ruby-core:34820]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 0 deletions

diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index fffa96e313..b465814140 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -442,6 +442,18 @@ class TestFloat < Test::Unit::TestCase
     assert(Float(o).nan?)
   end
 
+  def test_invalid_str
+    bug4310 = '[ruby-core:34820]'
+    assert_raise(ArgumentError, bug4310) {
+      stress, GC.stress = GC.stress, true
+      begin
+        Float('a'*10000)
+      ensure
+        GC.stress = stress
+      end
+    }
+  end
+
   def test_num2dbl
     assert_raise(TypeError) do
       1.0.step(2.0, "0.5") {}