From a199dc848e23686938246e333dac3b8eeaf3578f Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 18 Feb 2009 13:17:08 +0000 Subject: 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 --- ChangeLog | 5 +++++ pack.c | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e3d3dd3ee0..0d9f784550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 18 22:17:04 2009 Yukihiro Matsumoto + + * pack.c (pack_pack): propagate taint status from format string to + result string. + Wed Feb 18 22:07:44 2009 Kazuhiro NISHIYAMA * ext/gdbm/gdbm.c: do not set members of RSTRING(str) directly. diff --git a/pack.c b/pack.c index b22a8348b2..8e58364024 100644 --- 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 index d8772cea39..9ac5966564 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.1