shyouhei	2009-02-04 14:26:31 +0900 (Wed, 04 Feb 2009)

  New Revision: 22026

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22026

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

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/dir.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 22025)
+++ ruby_1_8_6/ChangeLog	(revision 22026)
@@ -1,3 +1,8 @@
+Wed Feb  4 14:25:44 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* dir.c (dir_globs): need taint check.  reported by steve
+	  <oksteev at gmail.com>
+
 Tue Feb  3 14:33:08 2009  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558)
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 22025)
+++ ruby_1_8_6/version.h	(revision 22026)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-02-03"
+#define RUBY_RELEASE_DATE "2009-02-04"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090203
-#define RUBY_PATCHLEVEL 318
+#define RUBY_RELEASE_CODE 20090204
+#define RUBY_PATCHLEVEL 319
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/dir.c
===================================================================
--- ruby_1_8_6/dir.c	(revision 22025)
+++ ruby_1_8_6/dir.c	(revision 22026)
@@ -1659,7 +1659,7 @@
     for (i = 0; i < argc; ++i) {
 	int status;
 	VALUE str = argv[i];
-	StringValue(str);
+	SafeStringValue(str);
 	status = push_glob(ary, RSTRING(str)->ptr, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/