diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/bigdecimal/bigdecimal.c | 1 | ||||
| -rw-r--r-- | test/bigdecimal/test_bigdecimal.rb | 14 |
3 files changed, 20 insertions, 2 deletions
@@ -1,6 +1,11 @@ +Sun Dec 3 00:06:00 2012 Kenta Murata <mrkn@mrkn.jp> + + * ext/bigdecimal/bigdecimal.c (BigDecimal_new): stop checking string + taintness. [Bug #5508] [ruby-core:40510] + Sun Dec 2 19:26:47 2012 Masaya Tarui <tarui@ruby-lang.org> - * thread.c (RB_GC_SAVE_MACHINE_CONTEXT, rb_gc_save_machine_context): + * thread.c (RB_GC_SAVE_MACHINE_CONTEXT, rb_gc_save_machine_context): extract rb_gc_save_machine_context to RB_GC_SAVE_MACHINE_CONTEXT. NOTE: machine_regs and machine_stack_end must be set in current scope. diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index fa32c99282..1435c03eb0 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -2403,7 +2403,6 @@ BigDecimal_new(int argc, VALUE *argv) break; } StringValueCStr(iniValue); - rb_check_safe_obj(iniValue); return VpAlloc(mf, RSTRING_PTR(iniValue)); } diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb index ed4a1d40ab..a06adb1356 100644 --- a/test/bigdecimal/test_bigdecimal.rb +++ b/test/bigdecimal/test_bigdecimal.rb @@ -100,6 +100,13 @@ class TestBigDecimal < Test::Unit::TestCase end end + def test_global_new_with_tainted_string + Thread.new { + $SAFE = 1 + BigDecimal('1'.taint) + }.join + end + def test_new assert_equal(1, BigDecimal.new("1")) assert_equal(1, BigDecimal.new("1", 1)) @@ -150,6 +157,13 @@ class TestBigDecimal < Test::Unit::TestCase end end + def test_new_with_tainted_string + Thread.new { + $SAFE = 1 + BigDecimal.new('1'.taint) + }.join + end + def _test_mode(type) BigDecimal.mode(type, true) assert_raise(FloatDomainError) { yield } |