merged r20074 from trunk into ruby_1_9_1.

* dir.c (dir_globs): need taint check.  reported by steve
  <oksteev at gmail.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index fbb54237ac..5c94faf581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 31 12:51:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_globs): need taint check.  reported by steve
+	  <oksteev at gmail.com>
+
 Fri Oct 31 12:42:45 2008  wanabe  <s.wanabe@gmail.com>
 
 	* array.c (rb_ary_decrement_share): fix to work recycling
diff --git a/dir.c b/dir.c
index 3de4c290be..ffc7e05c0e 100644
--- a/dir.c
+++ b/dir.c
@@ -1571,7 +1571,7 @@ dir_globs(long argc, VALUE *argv, int flags)
     for (i = 0; i < argc; ++i) {
 	int status;
 	VALUE str = argv[i];
-	StringValue(str);
+	SafeStringValue(str);
 	status = push_glob(ary, str, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }