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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/file.c b/file.c
index 918ac112d5..e4261293ce 100644
--- a/file.c
+++ b/file.c
@@ -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);
     }