aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-02 08:05:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-02 08:05:59 +0000
commitce44723cf8a97c03895d75cf906e404c5dde6aae (patch)
tree456267877ddc5a1453a615ee7d637c446b26e4bd
parentaac16ed13ebdf9c9e4bd75c58e7779b4475e6dd8 (diff)
downloadruby-ce44723cf8a97c03895d75cf906e404c5dde6aae.tar.gz
* file.c (rb_find_file_ext): should not be infected from other
load paths. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--file.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index abeee08369..989e423e33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 2 17:05:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (rb_find_file_ext): should not be infected from other
+ load paths.
+
Mon Feb 2 16:33:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (dir_s_home): new method. [ruby-core:21454]
diff --git a/file.c b/file.c
index 15979c4f55..4155d33a1c 100644
--- a/file.c
+++ b/file.c
@@ -4566,6 +4566,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);
}