1 files changed, 51 insertions, 0 deletions
diff --git a/test/rexml/test_document.rb b/test/rexml/test_document.rb
index 171d480557..43efbca38c 100644
--- a/test/rexml/test_document.rb
+++ b/test/rexml/test_document.rb
@@ -48,6 +48,22 @@ EOF
 </member>
 EOF
 
+    XML_WITH_NESTED_EMPTY_ENTITY = <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE member [
+  <!ENTITY a "&b;&b;&b;&b;&b;&b;&b;&b;&b;&b;">
+  <!ENTITY b "&c;&c;&c;&c;&c;&c;&c;&c;&c;&c;">
+  <!ENTITY c "&d;&d;&d;&d;&d;&d;&d;&d;&d;&d;">
+  <!ENTITY d "&e;&e;&e;&e;&e;&e;&e;&e;&e;&e;">
+  <!ENTITY e "&f;&f;&f;&f;&f;&f;&f;&f;&f;&f;">
+  <!ENTITY f "&g;&g;&g;&g;&g;&g;&g;&g;&g;&g;">
+  <!ENTITY g "">
+]>
+<member>
+&a;
+</member>
+EOF
+
     XML_WITH_NESTED_PARAMETER_ENTITY = <<EOF
 <!DOCTYPE root [
   <!ENTITY % a "BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.BOOM.">
@@ -62,6 +78,20 @@ EOF
 <cd></cd>
 EOF
 
+    XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY = <<EOF
+<!DOCTYPE root [
+  <!ENTITY % a "">
+  <!ENTITY % b "%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;%a;">
+  <!ENTITY % c "%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;%b;">
+  <!ENTITY % d "%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;%c;">
+  <!ENTITY % e "%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;">
+  <!ENTITY % f "%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;">
+  <!ENTITY % g "%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;">
+  <!ENTITY test "test %g;">
+]>
+<cd></cd>
+EOF
+
     XML_WITH_4_ENTITY_EXPANSION = <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE member [
@@ -88,6 +118,18 @@ EOF
       end
       assert_equal(101, doc.entity_expansion_count)
 
+      doc = REXML::Document.new(XML_WITH_NESTED_EMPTY_ENTITY)
+      assert_raise(RuntimeError) do
+        doc.root.children.first.value
+      end
+      REXML::Security.entity_expansion_limit = 100
+      assert_equal(100, REXML::Security.entity_expansion_limit)
+      doc = REXML::Document.new(XML_WITH_NESTED_EMPTY_ENTITY)
+      assert_raise(RuntimeError) do
+        doc.root.children.first.value
+      end
+      assert_equal(101, doc.entity_expansion_count)
+
       REXML::Security.entity_expansion_limit = 4
       doc = REXML::Document.new(XML_WITH_4_ENTITY_EXPANSION)
       assert_equal("\na\na a\n<\n", doc.root.children.first.value)
@@ -109,6 +151,15 @@ EOF
       assert_raise(REXML::ParseException) do
         REXML::Document.new(XML_WITH_NESTED_PARAMETER_ENTITY)
       end
+
+      assert_raise(REXML::ParseException) do
+        REXML::Document.new(XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY)
+      end
+      REXML::Security.entity_expansion_limit = 100
+      assert_equal(100, REXML::Security.entity_expansion_limit)
+      assert_raise(REXML::ParseException) do
+        REXML::Document.new(XML_WITH_NESTED_EMPTY_PARAMETER_ENTITY)
+      end
     ensure
       REXML::Security.entity_expansion_limit = 10000
     end