yugui	2009-07-13 15:12:55 +0900 (Mon, 13 Jul 2009)

  New Revision: 24070

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24070

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/enum.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24069)
+++ ruby_1_9_1/ChangeLog	(revision 24070)
@@ -1,3 +1,10 @@
+Mon Jul  6 08:00:10 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* proc.c (make_curry_proc): should propagate lambda-ness.
Index: ruby_1_9_1/enum.c
===================================================================
--- ruby_1_9_1/enum.c	(revision 24069)
+++ ruby_1_9_1/enum.c	(revision 24070)
@@ -409,6 +409,7 @@
     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 @@
 
     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 @@
 	RARRAY_PTR(ary)[i] = RNODE(RARRAY_PTR(ary)[i])->u2.value;
     }
     RBASIC(ary)->klass = rb_cArray;
+    OBJ_INFECT(ary, obj);
+
     return ary;
 }
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24069)
+++ ruby_1_9_1/version.h	(revision 24070)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/