From fdec8bb0b30a6c28c7ef4569880b2faf4519c9af Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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
---
 time.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'time.c')

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;
-- 
cgit v1.2.3