kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

time.c: freeze and preserve marshal-loaded time zone

Browse source 
We need to prevent vtm.zone from pointing to a GC-ed string buffer.
The rb_copy_generic_ivar call misses it because get_attr deleted it.
Thanks to nobu for the rb_str_new_frozen suggestion.

* 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/trunk@45364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-03-19 08:19:13 +00:00
parent 5f00b99975
commit e0a0edf548
3 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Tue Mar 18 23:20:12 2014 Shota Fukumori <her@sorah.jp>
* vm_eval.c (eval_string_with_cref): Unify to use NIL_P. * vm_eval.c (eval_string_with_cref): Unify to use NIL_P.

15
test/ruby/test_time.rb
View file

@ -310,6 +310,21 @@ class TestTime < Test::Unit::TestCase
end end
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 def test_marshal_to_s
t1 = Time.new(2011,11,8, 0,42,25, 9*3600) t1 = Time.new(2011,11,8, 0,42,25, 9*3600)
t2 = Time.at(Marshal.load(Marshal.dump(t1))) t2 = Time.at(Marshal.load(Marshal.dump(t1)))

2
time.c
View file

@ -4827,7 +4827,9 @@ end_submicro: ;
time_fixoff(time); time_fixoff(time);
} }
if (!NIL_P(zone)) { if (!NIL_P(zone)) {
zone = rb_str_new_frozen(zone);
tobj->vtm.zone = RSTRING_PTR(zone); tobj->vtm.zone = RSTRING_PTR(zone);
rb_ivar_set(time, id_zone, zone);
} }
return time; return time;