diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-02 14:57:23 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-02 14:57:23 +0000 |
commit | 3a0a3f4ea22b88286b835518d7ec5d2d5308f34a (patch) | |
tree | 6da770580272d7b4bbcd492654eddfdcc9856c66 | |
parent | f099a94afaa5a8e3871e7de8fa89c97ce016dd54 (diff) | |
download | ruby-3a0a3f4ea22b88286b835518d7ec5d2d5308f34a.tar.gz |
* variable.c (rb_define_hooked_variable): guard *var from GC to
prevent collecting argf under RUBY_DEBUG=gc_stress.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | variable.c | 9 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri May 2 23:55:15 2008 Tanaka Akira <akr@fsij.org> + + * variable.c (rb_define_hooked_variable): guard *var from GC to + prevent collecting argf under RUBY_DEBUG=gc_stress. + Fri May 2 17:29:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * range.c (range_step): call to_int if step is not a numeric diff --git a/variable.c b/variable.c index 154f0872b0..a935c51d3a 100644 --- a/variable.c +++ b/variable.c @@ -455,13 +455,20 @@ rb_define_hooked_variable( void (*setter)(ANYARGS)) { struct global_variable *gvar; - ID id = global_id(name); + ID id; + VALUE tmp; + + if (var) + tmp = *var; + id = global_id(name); gvar = rb_global_entry(id)->var; gvar->data = (void*)var; gvar->getter = getter?getter:var_getter; gvar->setter = setter?setter:var_setter; gvar->marker = var_marker; + + RB_GC_GUARD(tmp); } void |