merges r24371 from trunk into ruby_1_9_1.

--
* thread.c (recursive_push): untrust internal hash to prevent
  unexpected SecurityError.  a patch from Kazuhiro NISHIYAMA.
  Fix: #1864  [ruby-dev:38982]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 0 deletions

diff --git a/thread.c b/thread.c
index bc6614b17..c264b58af 100644
--- a/thread.c
+++ b/thread.c
@@ -3333,6 +3333,7 @@ recursive_push(VALUE hash, VALUE obj, VALUE paired_obj)
     }
     if (NIL_P(list) || TYPE(list) != T_HASH) {
 	list = rb_hash_new();
+	OBJ_UNTRUST(list);
 	rb_hash_aset(hash, sym, list);
     }
     if (!paired_obj) {
@@ -3345,6 +3346,7 @@ recursive_push(VALUE hash, VALUE obj, VALUE paired_obj)
 	if (TYPE(pair_list) != T_HASH){
 	    VALUE other_paired_obj = pair_list;
 	    pair_list = rb_hash_new();
+	    OBJ_UNTRUST(pair_list);
 	    rb_hash_aset(pair_list, other_paired_obj, Qtrue);
 	    rb_hash_aset(list, obj, pair_list);
 	}