diff options
| author | Chris Burdess <dog@gnu.org> | 2005-05-25 20:23:01 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-05-25 20:23:01 +0000 |
| commit | 24597146d4d08526bc0a2032e44f5523f6399db3 (patch) | |
| tree | be3c8df326dddfb63748c43f188b6a8afc02cf08 | |
| parent | 9f938de17ca1aff1e5ea66e664159764fa1cc770 (diff) | |
| download | gcc-24597146d4d08526bc0a2032e44f5523f6399db3.zip gcc-24597146d4d08526bc0a2032e44f5523f6399db3.tar.gz gcc-24597146d4d08526bc0a2032e44f5523f6399db3.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/xml/dom/ls/SAXEventSink.java | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index be3a535..717747e 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 60b99d4..2ff4191 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) |