shyouhei	2009-02-18 22:17:08 +0900 (Wed, 18 Feb 2009)

  New Revision: 22410

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

  Log:
    merge revision(s) 20525:
    * pack.c (pack_pack): propagate taint status from format string to
      result string.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/pack.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22409)
+++ ruby_1_8_7/ChangeLog	(revision 22410)
@@ -1,3 +1,8 @@
+Wed Feb 18 22:17:04 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* pack.c (pack_pack): propagate taint status from format string to
+	  result string.
+
 Wed Feb 18 22:07:44 2009  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* ext/gdbm/gdbm.c: do not set members of RSTRING(str) directly.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22409)
+++ ruby_1_8_7/version.h	(revision 22410)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-18"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090218
-#define RUBY_PATCHLEVEL 124
+#define RUBY_PATCHLEVEL 125
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/pack.c
===================================================================
--- ruby_1_8_7/pack.c	(revision 22409)
+++ ruby_1_8_7/pack.c	(revision 22410)
@@ -1001,6 +1001,7 @@
     if (associates) {
 	rb_str_associate(res, associates);
     }
+    OBJ_INFECT(res, fmt);
     return res;
 }
 

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