aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-04 16:20:02 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-04 16:20:02 +0000
commit408ca7cbb1e0d7866405fe1a6b3aa6f4dc8409fb (patch)
tree8d73333c6eb4834837765687d4a9da2d1ddd6bca
parent80a3f22b77d1be4e06e8246d07b0eaeaaf1d8e35 (diff)
downloadruby-408ca7cbb1e0d7866405fe1a6b3aa6f4dc8409fb.tar.gz
* pack.c (pack_pack): propagate taint status from format string to
result string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--pack.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 60deb3a729..64bbaec6ce 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.
+
Fri Dec 5 00:34:10 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c (run_exec_dup2): need to sort by reverted order when
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;
}