From b972878978ec8fa860eab3af5ac466b6b85c628d Mon Sep 17 00:00:00 2001 From: kou Date: Tue, 26 Feb 2013 14:34:01 +0000 Subject: * lib/rexml/document.rb: move entity_expansion_limit accessor to ... * lib/rexml/rexml.rb: ... here for consistency. * lib/rexml/document.rb (REXML::Document.entity_expansion_limit): deprecated. * lib/rexml/document.rb (REXML::Document.entity_expansion_limit=): deprecated. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rexml/document.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/rexml/document.rb') diff --git a/lib/rexml/document.rb b/lib/rexml/document.rb index 76679d1c16..1c67da8718 100644 --- a/lib/rexml/document.rb +++ b/lib/rexml/document.rb @@ -243,16 +243,18 @@ module REXML Parsers::StreamParser.new( source, listener ).parse end - @@entity_expansion_limit = 10_000 - # Set the entity expansion limit. By default the limit is set to 10000. + # + # Deprecated. Use REXML.entity_expansion_limit= instead. def Document::entity_expansion_limit=( val ) - @@entity_expansion_limit = val + REXML.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. def Document::entity_expansion_limit - return @@entity_expansion_limit + return REXML.entity_expansion_limit end # Set the entity expansion limit. By default the limit is set to 10240. @@ -273,7 +275,7 @@ module REXML def record_entity_expansion @entity_expansion_count += 1 - if @entity_expansion_count > @@entity_expansion_limit + if @entity_expansion_count > REXML.entity_expansion_limit raise "number of entity expansions exceeded, processing aborted." end end -- cgit v1.2.3