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

* eval.c (rb_require_safe): get actual path string under safe level

Browse Source 
when requested.  fixed: [ruby-dev:25815]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-03-07 12:01:46 +00:00
parent 39d35c1130
commit 562185ff5c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Mar 7 21:01:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_require_safe): get actual path string under safe level
when requested. fixed: [ruby-dev:25815]
Mon Mar 7 16:46:02 2005 NAKAMURA Usaku <usa@ruby-lang.org> Mon Mar 7 16:46:02 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read, * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
@ -21,7 +26,7 @@ Mon Mar 7 10:28:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
Mon Mar 7 01:21:01 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Mar 7 01:21:01 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tkutil/tkutil.c: follow the change of st.c (committed * ext/tk/tkutil/tkutil.c: follow the change of st.c (committed
at Fri, 4 Mar 2005 15:47:47 +0900 by matz) at Fri, 4 Mar 2005 15:47:47 +0900 by matz)
Mon Mar 7 00:01:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Mon Mar 7 00:01:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@ -79,7 +84,7 @@ Sat Mar 5 17:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
Sat Mar 5 16:50:00 2005 NARUSE, Yui <naruse@ruby-lang.org> Sat Mar 5 16:50:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65 * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
Sat Mar 5 16:29:26 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Sat Mar 5 16:29:26 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>

4
eval.c
View File

@ -6857,8 +6857,6 @@ rb_require_safe(fname, safe)
} volatile saved; } volatile saved;
char *volatile ftptr = 0; char *volatile ftptr = 0;
FilePathValue(fname);
fname = rb_str_new4(fname);
saved.vmode = scope_vmode; saved.vmode = scope_vmode;
saved.node = ruby_current_node; saved.node = ruby_current_node;
saved.callee = ruby_frame->callee; saved.callee = ruby_frame->callee;
@ -6871,6 +6869,8 @@ rb_require_safe(fname, safe)
int found; int found;
ruby_safe_level = safe; ruby_safe_level = safe;
FilePathValue(fname);
*(volatile VALUE *)&fname = rb_str_new4(fname);
found = search_required(fname, &feature, &path); found = search_required(fname, &feature, &path);
if (found) { if (found) {
if (!path || load_wait(RSTRING(feature)->ptr)) { if (!path || load_wait(RSTRING(feature)->ptr)) {