summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-13 05:59:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-13 05:59:01 +0000
commit7d8ae4129e9fb91a9e4df4484675b5870ff13a47 (patch)
tree2a781eb5bd6245b48d6abfcd26f157ac2a05e073
parent087ecdf5edfeb5c29866bb39ce0eaecaa6550ed0 (diff)
* load.c (rb_require_safe): FilePathValue() implies rb_str_new4().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--load.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f58c58d273..25049d2619 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Sat Jun 13 14:57:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jun 13 14:58:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * load.c (rb_require_safe): FilePathValue() implies rb_str_new4().
* load.c (rb_mod_autoload): try conversion to path like as
require. [ruby-core:23834]
diff --git a/load.c b/load.c
index 645dca2040..6e554f1d8b 100644
--- a/load.c
+++ b/load.c
@@ -545,7 +545,7 @@ load_ext(VALUE path)
VALUE
rb_require_safe(VALUE fname, int safe)
{
- VALUE result = Qnil;
+ volatile VALUE result = Qnil;
rb_thread_t *th = GET_THREAD();
volatile VALUE errinfo = th->errinfo;
int state;
@@ -563,7 +563,6 @@ rb_require_safe(VALUE fname, int safe)
rb_set_safe_level_force(safe);
FilePathValue(fname);
- RB_GC_GUARD(fname) = rb_str_new4(fname);
rb_set_safe_level_force(0);
found = search_required(fname, &path);
if (found) {