From 556a67e569030495019b724a5ecc89d873f8886a Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Aug 2009 15:32:51 +0000
Subject: 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
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 72c24a889..e20dcee39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug  3 18:12:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* thread.c (recursive_push): untrust internal hash to prevent
+	  unexpected SecurityError.  a patch from Kazuhiro NISHIYAMA.
+	  Fix: #1864  [ruby-dev:38982]
+
 Mon Aug  3 17:06:05 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/README: updated.  a patch from Daniel Bovensiepen.
-- 
cgit