|
 |
b6bbea |
Index: ChangeLog
|
|
|
b6bbea |
===================================================================
|
|
|
b6bbea |
--- ChangeLog (revision 48402)
|
|
|
b6bbea |
+++ ChangeLog (revision 48403)
|
|
|
b6bbea |
@@ -1,3 +1,8 @@
|
|
|
b6bbea |
+Thu Nov 13 22:31:50 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+ * lib/rexml/document.rb: add REXML::Document#document.
|
|
|
b6bbea |
+ reported by Tomas Hoger <thoger@redhat.com> and patched by nahi.
|
|
|
b6bbea |
+
|
|
|
b6bbea |
Mon Oct 27 20:21:05 2014 NAKAMURA Usaku <usa@ruby-lang.org>
|
|
|
b6bbea |
|
|
|
b6bbea |
* lib/rexml/entity.rb: keep the entity size within the limitation.
|
|
|
b6bbea |
Index: lib/rexml/document.rb
|
|
|
b6bbea |
===================================================================
|
|
|
b6bbea |
--- lib/rexml/document.rb (revision 48402)
|
|
|
b6bbea |
+++ lib/rexml/document.rb (revision 48403)
|
|
|
b6bbea |
@@ -278,6 +278,10 @@
|
|
|
b6bbea |
end
|
|
|
b6bbea |
end
|
|
|
b6bbea |
|
|
|
b6bbea |
+ def document
|
|
|
b6bbea |
+ self
|
|
|
b6bbea |
+ end
|
|
|
b6bbea |
+
|
|
|
b6bbea |
private
|
|
|
b6bbea |
def build( source )
|
|
|
b6bbea |
Parsers::TreeParser.new( source, self ).parse
|
|
|
b6bbea |
Index: lib/rexml/entity.rb
|
|
|
b6bbea |
===================================================================
|
|
|
b6bbea |
--- lib/rexml/entity.rb (revision 48402)
|
|
|
b6bbea |
+++ lib/rexml/entity.rb (revision 48403)
|
|
|
b6bbea |
@@ -157,6 +157,7 @@
|
|
|
b6bbea |
|
|
|
b6bbea |
# This is a set of entity constants -- the ones defined in the XML
|
|
|
b6bbea |
# specification. These are +gt+, +lt+, +amp+, +quot+ and +apos+.
|
|
|
b6bbea |
+ # CAUTION: these entities does not have parent and document
|
|
|
b6bbea |
module EntityConst
|
|
|
b6bbea |
# +>+
|
|
|
b6bbea |
GT = Entity.new( 'gt', '>' )
|
|
|
b6bbea |
Index: test/rexml/test_document.rb
|
|
|
b6bbea |
===================================================================
|
|
|
b6bbea |
--- test/rexml/test_document.rb (revision 48402)
|
|
|
b6bbea |
+++ test/rexml/test_document.rb (revision 48403)
|
|
|
b6bbea |
@@ -47,6 +47,22 @@
|
|
|
b6bbea |
</member>
|
|
|
b6bbea |
EOF
|
|
|
b6bbea |
|
|
|
b6bbea |
+ XML_WITH_NESTED_EMPTY_ENTITY = <
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+]>
|
|
|
b6bbea |
+<member>
|
|
|
b6bbea |
+&a;
|
|
|
b6bbea |
+</member>
|
|
|
b6bbea |
+EOF
|
|
|
b6bbea |
+
|
|
|
b6bbea |
XML_WITH_NESTED_PARAMETER_ENTITY = <
|
|
|
b6bbea |
|
|
|
b6bbea |
|
|
|
b6bbea |
@@ -60,6 +76,19 @@
|
|
|
b6bbea |
]>
|
|
|
b6bbea |
<cd></cd>
|
|
|
b6bbea |
EOF
|
|
|
b6bbea |
+ XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY = <
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+]>
|
|
|
b6bbea |
+<cd></cd>
|
|
|
b6bbea |
+EOF
|
|
|
b6bbea |
|
|
|
b6bbea |
XML_WITH_4_ENTITY_EXPANSION = <
|
|
|
b6bbea |
|
|
|
b6bbea |
@@ -87,6 +116,18 @@
|
|
|
b6bbea |
end
|
|
|
b6bbea |
assert_equal(101, doc.entity_expansion_count)
|
|
|
b6bbea |
|
|
|
b6bbea |
+ doc = REXML::Document.new(XML_WITH_NESTED_EMPTY_ENTITY)
|
|
|
b6bbea |
+ assert_raise(RuntimeError) do
|
|
|
b6bbea |
+ doc.root.children.first.value
|
|
|
b6bbea |
+ end
|
|
|
b6bbea |
+ REXML::Document.entity_expansion_limit = 100
|
|
|
b6bbea |
+ assert_equal(100, REXML::Document.entity_expansion_limit)
|
|
|
b6bbea |
+ doc = REXML::Document.new(XML_WITH_NESTED_EMPTY_ENTITY)
|
|
|
b6bbea |
+ assert_raise(RuntimeError) do
|
|
|
b6bbea |
+ doc.root.children.first.value
|
|
|
b6bbea |
+ end
|
|
|
b6bbea |
+ assert_equal(101, doc.entity_expansion_count)
|
|
|
b6bbea |
+
|
|
|
b6bbea |
REXML::Document.entity_expansion_limit = 4
|
|
|
b6bbea |
doc = REXML::Document.new(XML_WITH_4_ENTITY_EXPANSION)
|
|
|
b6bbea |
assert_equal("\na\na a\n<\n", doc.root.children.first.value)
|
|
|
b6bbea |
@@ -95,6 +136,15 @@
|
|
|
b6bbea |
assert_raise(RuntimeError) do
|
|
|
b6bbea |
doc.root.children.first.value
|
|
|
b6bbea |
end
|
|
|
b6bbea |
+
|
|
|
b6bbea |
+ assert_raise(REXML::ParseException) do
|
|
|
b6bbea |
+ REXML::Document.new(XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY)
|
|
|
b6bbea |
+ end
|
|
|
b6bbea |
+ REXML::Document.entity_expansion_limit = 100
|
|
|
b6bbea |
+ assert_equal(100, REXML::Document.entity_expansion_limit)
|
|
|
b6bbea |
+ assert_raise(REXML::ParseException) do
|
|
|
b6bbea |
+ REXML::Document.new(XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY)
|
|
|
b6bbea |
+ end
|
|
|
b6bbea |
ensure
|
|
|
b6bbea |
REXML::Document.entity_expansion_limit = 10000
|
|
|
b6bbea |
end
|
|
|
b6bbea |
Index: .
|
|
|
b6bbea |
===================================================================
|
|
|
b6bbea |
--- . (revision 48402)
|
|
|
b6bbea |
+++ . (revision 48403)
|
|
|
b6bbea |
|
|
|
b6bbea |
Property changes on: .
|
|
|
b6bbea |
___________________________________________________________________
|
|
|
b6bbea |
Modified: svn:mergeinfo
|
|
|
b6bbea |
Merged /trunk:r48402
|