merge revision(s) 20525:

* 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_7@22410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-18 13:17:08 +00:00
parent 21631ecabe
commit a199dc848e
3 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Wed Feb 18 22:17:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* pack.c (pack_pack): propagate taint status from format string to
result string.
Wed Feb 18 22:07:44 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> Wed Feb 18 22:07:44 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* ext/gdbm/gdbm.c: do not set members of RSTRING(str) directly. * ext/gdbm/gdbm.c: do not set members of RSTRING(str) directly.

1
pack.c
View file

@ -1001,6 +1001,7 @@ pack_pack(ary, fmt)
if (associates) { if (associates) {
rb_str_associate(res, associates); rb_str_associate(res, associates);
} }
OBJ_INFECT(res, fmt);
return res; return res;
} }

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-18" #define RUBY_RELEASE_DATE "2009-02-18"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090218 #define RUBY_RELEASE_CODE 20090218
#define RUBY_PATCHLEVEL 124 #define RUBY_PATCHLEVEL 125
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8