merges r20524 from trunk into ruby_1_9_1.

* pack.c (pack_pack): propagate taint status from format string to
  result string.

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

2 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index afb4fa7ed3..cd58c9aff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  5 01:19:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): propagate taint status from format string to
+	  result string.
+
 Thu Dec  4 23:02:13 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* spec/default.mspec: follows changes in rubyspec project.
diff --git a/pack.c b/pack.c
index 2ecb2d68d6..c4ee6dbb30 100644
--- a/pack.c
+++ b/pack.c
@@ -1017,6 +1017,7 @@ pack_pack(VALUE ary, VALUE fmt)
     if (associates) {
 	rb_str_associate(res, associates);
     }
+    OBJ_INFECT(res, fmt);
     return res;
 }