archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 39509,39511: [Backport #7961]

Browse source 
* lib/rexml/document.rb: move entity_expansion_limit accessor to ...

	* lib/rexml/rexml.rb: ... here to make rexml/text independent from
	  REXML::Document. It causes circular require.

	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit):
	  deprecated.

	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit=):
	  deprecated.

	* lib/rexml/text.rb: add missing require "rexml/rexml" for
	  REXML.entity_expansion_limit.
	  Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]

	* lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...

	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):

	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
	  REXML.entity_expansion_text_limit.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-03-26 17:54:43 +00:00
parent 4d45207c07
commit 5c2169d4c7
5 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
Wed Mar 27 02:53:53 2013 Kouhei Sutou <kou@cozmixng.org>
* lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...
* lib/rexml/rexml.rb: ... here to make rexml/text independent from
REXML::Document. It causes circular require.
* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
deprecated.
* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
deprecated.
* lib/rexml/text.rb: add missing require "rexml/rexml" for
REXML.entity_expansion_text_limit.
Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]
Wed Mar 27 02:50:45 2013 Shugo Maeda <shugo@ruby-lang.org> Wed Mar 27 02:50:45 2013 Shugo Maeda <shugo@ruby-lang.org>
* object.c (Init_Object): remove Module#used, which has been * object.c (Init_Object): remove Module#used, which has been

10
lib/rexml/document.rb
View file

@ -255,16 +255,18 @@ module REXML
return @@entity_expansion_limit return @@entity_expansion_limit
end end
@@entity_expansion_text_limit = 10_240
# Set the entity expansion limit. By default the limit is set to 10240. # Set the entity expansion limit. By default the limit is set to 10240.
#
# Deprecated. Use REXML.entity_expansion_text_limit= instead.
def Document::entity_expansion_text_limit=( val ) def Document::entity_expansion_text_limit=( val )
@@entity_expansion_text_limit = val REXML.entity_expansion_text_limit = val
end end
# Get the entity expansion limit. By default the limit is set to 10240. # Get the entity expansion limit. By default the limit is set to 10240.
#
# Deprecated. Use REXML.entity_expansion_text_limit instead.
def Document::entity_expansion_text_limit def Document::entity_expansion_text_limit
return @@entity_expansion_text_limit return REXML.entity_expansion_text_limit
end end
attr_reader :entity_expansion_count attr_reader :entity_expansion_count

12
lib/rexml/rexml.rb
View file

@ -28,4 +28,16 @@ module REXML
Copyright = COPYRIGHT Copyright = COPYRIGHT
Version = VERSION Version = VERSION
@@entity_expansion_text_limit = 10_240
# Set the entity expansion limit. By default the limit is set to 10240.
def self.entity_expansion_text_limit=( val )
@@entity_expansion_text_limit = val
end
# Get the entity expansion limit. By default the limit is set to 10240.
def self.entity_expansion_text_limit
return @@entity_expansion_text_limit
end
end end

3
lib/rexml/text.rb
View file

@ -1,3 +1,4 @@
require 'rexml/rexml'
require 'rexml/entity' require 'rexml/entity'
require 'rexml/doctype' require 'rexml/doctype'
require 'rexml/child' require 'rexml/child'
@ -383,7 +384,7 @@ module REXML
sum = 0 sum = 0
string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) { string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
s = Text.expand($&, doctype, filter) s = Text.expand($&, doctype, filter)
if sum + s.bytesize > Document.entity_expansion_text_limit if sum + s.bytesize > REXML.entity_expansion_text_limit
raise "entity expansion has grown too large" raise "entity expansion has grown too large"
else else
sum += s.bytesize sum += s.bytesize

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-27" #define RUBY_RELEASE_DATE "2013-03-27"
#define RUBY_PATCHLEVEL 97 #define RUBY_PATCHLEVEL 98
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3