From 7d8ae4129e9fb91a9e4df4484675b5870ff13a47 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 13 Jun 2009 05:59:01 +0000 Subject: [PATCH] * 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 --- ChangeLog | 4 +++- load.c | 3 +-- 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 +Sat Jun 13 14:58:57 2009 Nobuyoshi Nakada + + * 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) {