diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | error.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_float.rb | 5 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jan 24 21:04:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * error.c (rb_invalid_str): prevent intermediate variable from GC. + [ruby-core:34820] + Sun Jan 23 23:01:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * test/io/console/test_io_console.rb: Don't run test if the system @@ -970,7 +970,7 @@ nometh_err_args(VALUE self) void rb_invalid_str(const char *str, const char *type) { - VALUE s = rb_str_inspect(rb_str_new2(str)); + volatile VALUE s = rb_str_inspect(rb_str_new2(str)); rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING_PTR(s)); } diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index 7ab4ffc649..85faf63355 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -472,6 +472,11 @@ class TestFloat < Test::Unit::TestCase assert(Float(o).nan?) end + def test_invalid_str + bug4310 = '[ruby-core:34820]' + assert_raise(ArgumentError, bug4310) {under_gc_stress {Float('a'*10000)}} + end + def test_num2dbl assert_raise(TypeError) do 1.0.step(2.0, "0.5") {} |