diff --git a/ChangeLog b/ChangeLog index a8dcf5a1af..7b3668d266 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 27 19:50:27 2002 Nobuyoshi Nakada + + * ruby.c (require_libraries): prevent ruby_sorcefile from GC. + Tue Aug 27 15:03:35 2002 Yukihiro Matsumoto * file.c (rb_find_file): $LOAD_PATH must not be empty. diff --git a/ruby.c b/ruby.c index 76ed2aa3eb..8aa20ce11e 100644 --- a/ruby.c +++ b/ruby.c @@ -310,15 +310,14 @@ require_libraries() { extern NODE *ruby_eval_tree; extern NODE *ruby_eval_tree_begin; - char *orig_sourcefile = ruby_sourcefile; - NODE *save[2]; + NODE *save[3]; struct req_list *list = req_list_head.next; struct req_list *tmp; Init_ext(); /* should be called here for some reason :-( */ - ruby_sourcefile = 0; save[0] = ruby_eval_tree; save[1] = ruby_eval_tree_begin; + save[2] = NEW_NEWLINE(0); ruby_eval_tree = ruby_eval_tree_begin = 0; req_list_last = 0; while (list) { @@ -331,7 +330,10 @@ require_libraries() req_list_head.next = 0; ruby_eval_tree = save[0]; ruby_eval_tree_begin = save[1]; - ruby_sourcefile = orig_sourcefile; + ruby_current_node = save[2]; + ruby_set_current_source(); + ruby_current_node = 0; + rb_gc_force_recycle((VALUE)save[2]); } static void