summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-20 06:57:38 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-20 06:57:38 +0000
commita6d4e18284842ec93e91aed228392d51dd1ac966 (patch)
treed4ed3323b1b090d6e1c62b4a30ab496cec09f553 /ChangeLog
parent5988c787496e104d3552be02841c416f6006f4b6 (diff)
merge revision(s) 26277:
* eval.c (recursive_push): Taint internal hash to prevent unexpected SecurityError; fixes #1864. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e1e5baaa5b..33ed37b6e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 20 15:54:08 2010 Akinori MUSHA <knu@iDaemons.org>
+
+ * eval.c (recursive_push): Taint internal hash to prevent
+ unexpected SecurityError; fixes #1864.
+
Thu May 20 15:39:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_fwrite): preserve errno. [ruby-core:27425]