1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* load.c (rb_require_safe): FilePathValue() implies rb_str_new4().

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-06-13 05:59:01 +00:00
parent 087ecdf5ed
commit 7d8ae4129e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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 * load.c (rb_mod_autoload): try conversion to path like as
require. [ruby-core:23834] require. [ruby-core:23834]

3
load.c
View File

@ -545,7 +545,7 @@ load_ext(VALUE path)
VALUE VALUE
rb_require_safe(VALUE fname, int safe) rb_require_safe(VALUE fname, int safe)
{ {
VALUE result = Qnil; volatile VALUE result = Qnil;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
volatile VALUE errinfo = th->errinfo; volatile VALUE errinfo = th->errinfo;
int state; int state;
@ -563,7 +563,6 @@ rb_require_safe(VALUE fname, int safe)
rb_set_safe_level_force(safe); rb_set_safe_level_force(safe);
FilePathValue(fname); FilePathValue(fname);
RB_GC_GUARD(fname) = rb_str_new4(fname);
rb_set_safe_level_force(0); rb_set_safe_level_force(0);
found = search_required(fname, &path); found = search_required(fname, &path);
if (found) { if (found) {