yugui	2009-08-09 00:33:20 +0900 (Sun, 09 Aug 2009)

  New Revision: 24464

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

  Log:
    merges r24381 from trunk into ruby_1_9_1.
    --
    * thread.c (recursive_push): need to set UNTRUST.  [ruby-dev:38997]

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

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24463)
+++ ruby_1_9_1/ChangeLog	(revision 24464)
@@ -1,3 +1,7 @@
+Tue Aug  4 05:43:03 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* thread.c (recursive_push): need to set UNTRUST.  [ruby-dev:38997]
+
 Mon Aug  3 18:25:08 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* sample/svr.rb: obsolete TCPserver renamed.  [ruby-core:24712]
Index: ruby_1_9_1/thread.c
===================================================================
--- ruby_1_9_1/thread.c	(revision 24463)
+++ ruby_1_9_1/thread.c	(revision 24464)
@@ -3325,6 +3325,7 @@
     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;
     }
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24463)
+++ ruby_1_9_1/version.h	(revision 24464)
@@ -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

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