kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases 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
Download patch file Download diff file Expand all files Collapse all files

5
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,

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)) {