summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-04 16:44:05 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-04 16:44:05 +0000
commit60ea0155bb3b71c82142da4e2ae89f824f859334 (patch)
tree8a1c4326493d9bbf2af4289dcce642700ed0edf9 /lib
parent0619aadf5df0d662150cb9d9d0f2ad93044e350c (diff)
downloadruby-60ea0155bb3b71c82142da4e2ae89f824f859334.tar.gz
ruby-60ea0155bb3b71c82142da4e2ae89f824f859334.tar.xz
ruby-60ea0155bb3b71c82142da4e2ae89f824f859334.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@24396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/pp.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pp.rb b/lib/pp.rb
index e28875c8e..a71ce9db3 100644
--- a/lib/pp.rb
+++ b/lib/pp.rb
@@ -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