From 959077c8e0ec27dfa72025a85c99a4acc26f6491 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 20 Oct 2004 10:29:29 +0000 Subject: *** empty log message *** git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 2 +- eval.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f78d73f36..af92ac5fec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,7 @@ Tue Oct 19 22:43:12 2004 Dave Thomas Tue Oct 19 20:41:37 2004 Masaki Suketa - * ext/win32ole.c(ole_invoke): retrieve the result value when + * ext/win32ole.c(ole_invoke): retrieve the result value when retrying the IDispatch::invoke. Tue Oct 19 17:24:11 2004 Yukihiro Matsumoto diff --git a/eval.c b/eval.c index facb7438ff..9236df78e0 100644 --- a/eval.c +++ b/eval.c @@ -6682,7 +6682,7 @@ search_required(fname, featurep, path) char *ext, *ftptr; int type; - *featurep = fname; + *featurep = fname = rb_str_new4(fname); *path = 0; ext = strrchr(ftptr = RSTRING(fname)->ptr, '.'); if (ext && !strchr(ext, '/')) { @@ -6786,10 +6786,6 @@ rb_require_safe(fname, safe) /* partial state */ ftptr = ruby_strdup(RSTRING(feature)->ptr); st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread); - if (feature == fname && !OBJ_FROZEN(feature)) { - feature = rb_str_dup(feature); - OBJ_FREEZE(feature); - } rb_load(path, 0); break; -- cgit v1.2.3