diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_time.rb | 15 | ||||
| -rw-r--r-- | time.c | 2 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Wed Mar 19 17:13:06 2014 Eric Wong <e@80x24.org> + + * time.c (time_mload): freeze and preserve marshal-loaded time zone + * test/ruby/test_time.rb: add test for GC on loaded object + [Bug #9652] + Tue Mar 18 23:20:12 2014 Shota Fukumori <her@sorah.jp> * vm_eval.c (eval_string_with_cref): Unify to use NIL_P. diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index c8b9e8f175..cb0859473f 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -310,6 +310,21 @@ class TestTime < Test::Unit::TestCase end end + def test_marshal_zone_gc + assert_separately(%w(--disable-gems), <<-'end;') + ENV["TZ"] = "Japan" + s = Marshal.dump(Time.now) + t = Marshal.load(s) + n = 0 + done = 1000000 + while t.zone.dup == "JST" && n < done + n += 1 + end + assert_equal n, done, "Bug #9652" + assert_equal "JST", t.zone, "Bug #9652" + end; + end + def test_marshal_to_s t1 = Time.new(2011,11,8, 0,42,25, 9*3600) t2 = Time.at(Marshal.load(Marshal.dump(t1))) @@ -4827,7 +4827,9 @@ end_submicro: ; time_fixoff(time); } if (!NIL_P(zone)) { + zone = rb_str_new_frozen(zone); tobj->vtm.zone = RSTRING_PTR(zone); + rb_ivar_set(time, id_zone, zone); } return time; |