From: Chris Burdess <dog@gnu.org>
Date: Wed, 25 May 2005 20:23:01 +0000 (+0000)
Subject: SAXEventSink.java: Ignore XML entities in start/ end entity callbacks.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24597146d4d08526bc0a2032e44f5523f6399db3;p=gcc.git

SAXEventSink.java: Ignore XML entities in start/ end entity callbacks.

2005-05-25  Chris Burdess  <dog@gnu.org>

	* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
	end entity callbacks.

From-SVN: r100163
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index be3a5351fd5..717747ed972 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-25  Chris Burdess  <dog@gnu.org>
+
+	* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+	end entity callbacks.
+
 2005-05-24  Gary Benson  <gbenson@redhat.com>
 
 	PR libgcj/21736:
diff --git a/libjava/gnu/xml/dom/ls/SAXEventSink.java b/libjava/gnu/xml/dom/ls/SAXEventSink.java
index 60b99d49305..2ff41910dd9 100644
--- a/libjava/gnu/xml/dom/ls/SAXEventSink.java
+++ b/libjava/gnu/xml/dom/ls/SAXEventSink.java
@@ -366,6 +366,14 @@ class SAXEventSink
         ctx = doctype;
         return;
       }
+    if ("lt".equals(name) ||
+        "gt".equals(name) ||
+        "amp".equals(name) ||
+        "apos".equals(name) ||
+        "quot".equals(name))
+      {
+        return;
+      }
     // Get entity
     NamedNodeMap entities = doctype.getEntities();
     Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@ class SAXEventSink
         // Ignore DTD and parameter entities
         return;
       }
+    if ("lt".equals(name) ||
+        "gt".equals(name) ||
+        "amp".equals(name) ||
+        "apos".equals(name) ||
+        "quot".equals(name))
+      {
+        return;
+      }
+    // Get entity
     Entity entity = popEntity();
     // TODO resolve external entities to ensure that entity has content
     if (expandEntityReferences)