merge revision(s) 20525:

shyouhei · shyouhei · commit 8c6b78c1da45 · 2009-02-18T13:16:37.000Z
* 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_8_6@22408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 18 22:12:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* pack.c (pack_pack): propagate taint status from format string to
+	  result string.
+
 Wed Feb 18 22:05:44 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* ext/gdbm/gdbm.c: do not set members of RSTRING(str) directly.
diff --git a/pack.c b/pack.c
@@ -1001,6 +1001,7 @@ pack_pack(ary, fmt)
     if (associates) {
 	rb_str_associate(res, associates);
     }
+    OBJ_INFECT(res, fmt);
     return res;
 }
 
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-18"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090218
-#define RUBY_PATCHLEVEL 338
+#define RUBY_PATCHLEVEL 339
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -1001,6 +1001,7 @@ pack_pack(ary, fmt)`
`1001`	`1001`	`if (associates) {`
`1002`	`1002`	`rb_str_associate(res, associates);`
`1003`	`1003`	`}`
	`1004`	`+ OBJ_INFECT(res, fmt);`
`1004`	`1005`	`return res;`
`1005`	`1006`	`}`
`1006`	`1007`