From d7d85f9ecdfb34b80a9d44f24462e0bdc1542b7a Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 7 Jun 2007 08:21:01 +0000 Subject: * iseq.c (prepare_iseq_build): freeze filename and name string. * variable.c: freeze class name string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ iseq.c | 5 ++++- variable.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 434a2507e0..3b9b4c2a8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 7 17:20:57 2007 Koichi Sasada + + * iseq.c (prepare_iseq_build): freeze filename and name string. + + * variable.c: freeze class name string. + Thu Jun 7 12:48:33 2007 Koichi Sasada * cont.c (cont_restore_1): fix to check root fiber [ruby-dev:30911]. diff --git a/iseq.c b/iseq.c index e8c75d5625..f8a7e8a545 100644 --- a/iseq.c +++ b/iseq.c @@ -109,9 +109,12 @@ prepare_iseq_build(rb_iseq_t *iseq, { rb_thread_t *th = GET_THREAD(); + OBJ_FREEZE(name); + OBJ_FREEZE(filename); + iseq->name = name; - iseq->defined_method_id = 0; iseq->filename = filename; + iseq->defined_method_id = 0; iseq->iseq_mark_ary = rb_ary_new(); RBASIC(iseq->iseq_mark_ary)->klass = 0; diff --git a/variable.c b/variable.c index be94d4314e..af29934ae8 100644 --- a/variable.c +++ b/variable.c @@ -53,8 +53,8 @@ fc_path(struct fc_result *fc, ID name) tmp = rb_str_dup(tmp); rb_str_cat2(tmp, "::"); rb_str_append(tmp, path); - - return tmp; + path = tmp; + break; } tmp = rb_str_new2(rb_id2name(fc->name)); rb_str_cat2(tmp, "::"); @@ -62,6 +62,7 @@ fc_path(struct fc_result *fc, ID name) path = tmp; fc = fc->prev; } + OBJ_FREEZE(path); return path; } @@ -148,6 +149,7 @@ classname(VALUE klass) return find_class_path(klass); } path = rb_str_new2(rb_id2name(SYM2ID(path))); + OBJ_FREEZE(path); st_insert(ROBJECT(klass)->iv_tbl, classpath, path); st_delete(RCLASS(klass)->iv_tbl, (st_data_t*)&classid, 0); } @@ -197,6 +199,7 @@ rb_class_path(VALUE klass) } } path = rb_sprintf("#<%s:%p>", s, (void*)klass); + OBJ_FREEZE(path); rb_ivar_set(klass, tmp_classpath, path); return path; @@ -216,6 +219,7 @@ rb_set_class_path(VALUE klass, VALUE under, const char *name) rb_str_cat2(str, "::"); rb_str_cat2(str, name); } + OBJ_FREEZE(str); rb_ivar_set(klass, classpath, str); } -- cgit v1.2.3