diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | enum.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Mon Jul 6 08:00:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * proc.c (make_curry_proc): should propagate lambda-ness. @@ -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; } @@ -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 |