summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-03 20:45:52 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-03 20:45:52 +0000
commitd6b9cc7baaa8d54e996f43f2520698279c6d349f (patch)
tree7d0f5688d6c79e090e589905deca12d7ff0d92fe
parent8fa67f4e5877ef92a2e3db151a8a2b7c2e13d8cf (diff)
* thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ab7dd5669c..453902c6bde 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]
+
Tue Aug 4 03:56:51 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tcltklib.c: fix trouble on old-style C function
diff --git a/thread.c b/thread.c
index 3870fc19abc..24b550f75db 100644
--- a/thread.c
+++ b/thread.c
@@ -3354,6 +3354,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;
}