From fdec8bb0b30a6c28c7ef4569880b2faf4519c9af Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 30 Apr 2014 07:34:23 +0000 Subject: merge revision(s) 45364,45395,45396,45403,45406: [Backport #9652] * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_time.rb | 15 +++++++++++++++ time.c | 2 ++ version.h | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d93c5c2a63..35f10dee5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 30 16:33:57 2014 Eric Wong + + * 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] + Wed Apr 30 16:15:09 2014 Kohei Suzuki * vm_method.c (rb_method_entry_get_without_cache): me->klass is 0 diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 02ebc6ac38..188ec0da04 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -311,6 +311,21 @@ class TestTime < Test::Unit::TestCase end end + def test_marshal_zone_gc + assert_separately(%w(--disable-gems), <<-'end;', timeout: 30) + ENV["TZ"] = "JST-9" + s = Marshal.dump(Time.now) + t = Marshal.load(s) + n = 0 + done = 100000 + while t.zone.dup == "JST" && n < done + n += 1 + end + assert_equal done, n, "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))) diff --git a/time.c b/time.c index 25c7f7eba9..dfcbfbac0f 100644 --- a/time.c +++ b/time.c @@ -4887,7 +4887,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; diff --git a/version.h b/version.h index 2e92c53646..f1ab57c68f 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-04-30" -#define RUBY_PATCHLEVEL 472 +#define RUBY_PATCHLEVEL 473 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 4 -- cgit v1.2.3