diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:33:47 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:33:47 +0000 |
commit | b1e7a961d2b728a66cf1c0a706de344b2b78e812 (patch) | |
tree | 1a7444c25f65e23442088e5c031ddfc7d2b2ed8f /lib | |
parent | 59dc7d4c9641204275fb9d93ffbd99baf3c58a98 (diff) |
merges r24396 from trunk into ruby_1_9_1.
--
* lib/pp.rb (guard_inspect_key): untrust internal hash to prevent
unexpected SecurityError.
* test/ruby/test_object.rb: add a test for [ruby-dev:38982].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pp.rb | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -107,17 +107,17 @@ class PP < PrettyPrint module PPMethods def guard_inspect_key if Thread.current[:__recursive_key__] == nil - Thread.current[:__recursive_key__] = {} + Thread.current[:__recursive_key__] = {}.untrust end if Thread.current[:__recursive_key__][:inspect] == nil - Thread.current[:__recursive_key__][:inspect] = {} + Thread.current[:__recursive_key__][:inspect] = {}.untrust end save = Thread.current[:__recursive_key__][:inspect] begin - Thread.current[:__recursive_key__][:inspect] = {} + Thread.current[:__recursive_key__][:inspect] = {}.untrust yield ensure Thread.current[:__recursive_key__][:inspect] = save |