diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-20 10:29:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-20 10:29:29 +0000 |
| commit | 7008e5c98b9e0fa8deecafc3d0474f4ed838d17a (patch) | |
| tree | ce1af07efa76fa68b4dc3e92863e58a5e7142130 | |
| parent | fd60841cc1d2bd941c454aef2c7ad3f003138c1e (diff) | |
| download | ruby-7008e5c98b9e0fa8deecafc3d0474f4ed838d17a.tar.gz ruby-7008e5c98b9e0fa8deecafc3d0474f4ed838d17a.tar.xz ruby-7008e5c98b9e0fa8deecafc3d0474f4ed838d17a.zip | |
*** empty log message ***
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | eval.c | 6 |
2 files changed, 2 insertions, 6 deletions
@@ -6,7 +6,7 @@ Tue Oct 19 22:43:12 2004 Dave Thomas <dave@pragprog.com> Tue Oct 19 20:41:37 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * 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 <matz@ruby-lang.org> @@ -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; |