diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 04:30:22 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 04:30:22 +0000 |
commit | 77aafc49f75eab9a967d92ed530a3604f08f1752 (patch) | |
tree | 98b4586c393be261dc7445c0445966d5de44774a /file.c | |
parent | f8811ab131263f01a9205fe074dbcf526c736fcf (diff) | |
download | ruby-77aafc49f75eab9a967d92ed530a3604f08f1752.tar.gz ruby-77aafc49f75eab9a967d92ed530a3604f08f1752.tar.xz ruby-77aafc49f75eab9a967d92ed530a3604f08f1752.zip |
merges r21917, r21955 and r21974 from trunk into ruby_1_9_1.
* load.c (rb_require_safe): raises when the path to be loaded is
tainted. [ruby-dev:37843]
---
* file.c (rb_find_file_ext): should not be infected from other
load paths.
---
* adds a test case for r21955 and r21917.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4551,6 +4551,7 @@ rb_find_file_ext(VALUE *filep, const char *const *ext) *filep = tmp; return j+1; } + FL_UNSET(tmp, FL_TAINT | FL_UNTRUSTED); } rb_str_set_len(fname, fnlen); } |