summaryrefslogtreecommitdiffstats
path: root/enum.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-07 03:55:18 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-07 03:55:18 +0000
commit30a7225bab574d7fea1f94325c8fd9f857199bbf (patch)
treef8c822544c55f305c3053aec92c0ba0c201a1761 /enum.c
parentdff2f32a9ab104e46d15ffeffbd9e3fd592d9170 (diff)
downloadruby-30a7225bab574d7fea1f94325c8fd9f857199bbf.tar.gz
ruby-30a7225bab574d7fea1f94325c8fd9f857199bbf.tar.xz
ruby-30a7225bab574d7fea1f94325c8fd9f857199bbf.zip
* enum.c (rb_enum_join): should propagate taint to the return
value. the change was overridden by r23967. [ruby-core:24176] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enum.c')
-rw-r--r--enum.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/enum.c b/enum.c
index 09ca85d93..bb480ba9e 100644
--- a/enum.c
+++ b/enum.c
@@ -1825,10 +1825,14 @@ VALUE
rb_enum_join(VALUE obj, VALUE sep)
{
VALUE args[2];
+
args[0] = 0;
args[1] = sep;
rb_block_call(obj, id_each, 0, 0, join_i, (VALUE)args);
- return args[0] ? args[0] : rb_str_new(0, 0);
+ if (!args[0]) args[0] = rb_str_new(0, 0);
+ OBJ_INFECT(args[0], obj);
+
+ return args[0];
}
/*