From ce1106a1711e45d46093681702ff95e7e484f6cf Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 13 Jul 2009 06:12:55 +0000 Subject: merges r23971 from trunk into ruby_1_9_1. -- * enum.c (enum_to_a): should propagate taint to the return value. [ruby-core:24152] * enum.c (enum_sort_by): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ enum.c | 4 ++++ version.h | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e61327dec..f4a21f4c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Jul 6 08:00:10 2009 Yukihiro Matsumoto + + * enum.c (enum_to_a): should propagate taint to the return value. + [ruby-core:24152] + + * enum.c (enum_sort_by): ditto. + Mon Jul 6 09:31:50 2009 Nobuyoshi Nakada * proc.c (make_curry_proc): should propagate lambda-ness. diff --git a/enum.c b/enum.c index 0b6acc024..8806285d2 100644 --- a/enum.c +++ b/enum.c @@ -409,6 +409,7 @@ enum_to_a(int argc, VALUE *argv, VALUE obj) VALUE ary = rb_ary_new(); rb_block_call(obj, id_each, argc, argv, collect_all, ary); + OBJ_INFECT(ary, obj); return ary; } @@ -602,6 +603,7 @@ enum_group_by(VALUE obj) hash = rb_hash_new(); rb_block_call(obj, id_each, 0, 0, group_by_i, hash); + OBJ_INFECT(hash, obj); return hash; } @@ -810,6 +812,8 @@ enum_sort_by(VALUE obj) RARRAY_PTR(ary)[i] = RNODE(RARRAY_PTR(ary)[i])->u2.value; } RBASIC(ary)->klass = rb_cArray; + OBJ_INFECT(ary, obj); + return ary; } diff --git a/version.h b/version.h index 38be2bf8d..7ca43543b 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-07-12" -#define RUBY_PATCHLEVEL 220 +#define RUBY_PATCHLEVEL 221 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit