From 2ba2dba5bef7ac397bda797c77ad3e824a5210c3 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 16 Oct 2002 04:43:28 +0000 Subject: [PATCH] * variable.c (rb_global_entry): not add global entry until initialized to avoid accessing it while GC. [ruby-dev:18514] * variable.c (rb_alias_variable): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ variable.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c656873198..7c9a0fca1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 16 13:36:29 2002 Nobuyoshi Nakada + + * variable.c (rb_global_entry): not add global entry until + initialized to avoid accessing it while GC. [ruby-dev:18514] + + * variable.c (rb_alias_variable): ditto. + Sat Oct 12 23:44:11 2002 Nobuyoshi Nakada * win32/win32.c (rb_w32_putc): wrong condition to fill or flush on diff --git a/variable.c b/variable.c index 4d3944d60b..f63f543d43 100644 --- a/variable.c +++ b/variable.c @@ -354,7 +354,6 @@ rb_global_entry(id) if (!st_lookup(rb_global_tbl, id, &entry)) { struct global_variable *var; entry = ALLOC(struct global_entry); - st_add_direct(rb_global_tbl, id, entry); var = ALLOC(struct global_variable); entry->id = id; entry->var = var; @@ -366,6 +365,7 @@ rb_global_entry(id) var->block_trace = 0; var->trace = 0; + st_add_direct(rb_global_tbl, id, entry); } return entry; } @@ -768,8 +768,8 @@ rb_alias_variable(name1, name2) entry2 = rb_global_entry(name2); if (!st_lookup(rb_global_tbl, name1, &entry1)) { entry1 = ALLOC(struct global_entry); - st_add_direct(rb_global_tbl, name1, entry1); entry1->id = name1; + st_add_direct(rb_global_tbl, name1, entry1); } else if (entry1->var != entry2->var) { struct global_variable *var = entry1->var;