diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-27 12:24:31 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-27 12:24:31 +0000 |
commit | 3b6d093451565c80d36c791ff6ac9cbc5918d287 (patch) | |
tree | 1c6a9675ea0eeb169707c4f82997cde3a5f5dca2 /lib/rexml/document.rb | |
parent | 20514a08936861205e21c80973b532d6af26c139 (diff) | |
download | ruby-3b6d093451565c80d36c791ff6ac9cbc5918d287.tar.gz |
* lib/rexml/security.rb (REXML::Security): create.
* lib/rexml/rexml.rb: move entity_expansion_limit and
entity_expansion_text_limit accessors to ...
* lib/rexml/security.rb: ... here.
* lib/rexml/document.rb: use REXML::Security.
* lib/rexml/text.rb: use REXML::Security.
* test/rexml/test_document.rb: use REXML::Security.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml/document.rb')
-rw-r--r-- | lib/rexml/document.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb index 1c67da8718..4b73696930 100644 --- a/lib/rexml/document.rb +++ b/lib/rexml/document.rb @@ -1,3 +1,4 @@ +require "rexml/security" require "rexml/element" require "rexml/xmldecl" require "rexml/source" @@ -245,37 +246,37 @@ module REXML # Set the entity expansion limit. By default the limit is set to 10000. # - # Deprecated. Use REXML.entity_expansion_limit= instead. + # Deprecated. Use REXML::Security.entity_expansion_limit= instead. def Document::entity_expansion_limit=( val ) - REXML.entity_expansion_limit = val + Security.entity_expansion_limit = val end # Get the entity expansion limit. By default the limit is set to 10000. # - # Deprecated. Use REXML.entity_expansion_limit= instead. + # Deprecated. Use REXML::Security.entity_expansion_limit= instead. def Document::entity_expansion_limit - return REXML.entity_expansion_limit + return Security.entity_expansion_limit end # Set the entity expansion limit. By default the limit is set to 10240. # - # Deprecated. Use REXML.entity_expansion_text_limit= instead. + # Deprecated. Use REXML::Security.entity_expansion_text_limit= instead. def Document::entity_expansion_text_limit=( val ) - REXML.entity_expansion_text_limit = val + Security.entity_expansion_text_limit = val end # Get the entity expansion limit. By default the limit is set to 10240. # - # Deprecated. Use REXML.entity_expansion_text_limit instead. + # Deprecated. Use REXML::Security.entity_expansion_text_limit instead. def Document::entity_expansion_text_limit - return REXML.entity_expansion_text_limit + return Security.entity_expansion_text_limit end attr_reader :entity_expansion_count def record_entity_expansion @entity_expansion_count += 1 - if @entity_expansion_count > REXML.entity_expansion_limit + if @entity_expansion_count > Security.entity_expansion_limit raise "number of entity expansions exceeded, processing aborted." end end |