merges r24381 from trunk into ruby_1_9_1.

--
* thread.c (recursive_push): need to set UNTRUST.  [ruby-dev:38997]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ee9fd67fd..65c19e90be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug  4 05:43:03 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (recursive_push): need to set UNTRUST.  [ruby-dev:38997]
+
 Mon Aug  3 18:25:08 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sample/svr.rb: obsolete TCPserver renamed.  [ruby-core:24712]
diff --git a/thread.c b/thread.c
index c264b58afb..ecc8f8482c 100644
--- a/thread.c
+++ b/thread.c
@@ -3325,6 +3325,7 @@ recursive_push(VALUE hash, VALUE obj, VALUE paired_obj)
     sym = ID2SYM(rb_frame_this_func());
     if (NIL_P(hash) || TYPE(hash) != T_HASH) {
 	hash = rb_hash_new();
+	OBJ_UNTRUST(hash);
 	rb_thread_local_aset(rb_thread_current(), recursive_key, hash);
 	list = Qnil;
     }
diff --git a/version.h b/version.h
index 53199f9db2..d81da7f4b5 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 268
+#define RUBY_PATCHLEVEL 269
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1