summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:33:20 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:33:20 +0000
commitdd8b1350b0ad0ac00a100909bf1cb656cd0b9b17 (patch)
tree8515c055427f55c89ec889a8d0d6220ad11b5ef0 /thread.c
parent5c4e05232e20b0b545e87c289cc857e04bb0f4fc (diff)
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
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c1
1 files changed, 1 insertions, 0 deletions
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;
}