From 792570871a9def2b779add72e5fb6b8256ffc225 Mon Sep 17 00:00:00 2001 From: Lillian Angel Date: Wed, 12 Apr 2006 16:10:25 +0000 Subject: 2006-04-12 Lillian Angel * gnu/xml/dom/DomDocument.java (checkNCName): Removed unneeded part of check. * gnu/xml/dom/DomNode.java (dispatchEvent): Added code to grow ancestors array if needed. Changed checks to use depth of node instead. Fixes an infinite loop and segmentation fault. * gnu/xml/dom/html2/DomHTMLParser.java (handleEndTag): No need to use/make a copy of the node. Causes an infinite loop. --- gnu/xml/dom/DomNode.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu/xml/dom/DomNode.java') diff --git a/gnu/xml/dom/DomNode.java b/gnu/xml/dom/DomNode.java index 93f7c6f64..c06a4c1f1 100644 --- a/gnu/xml/dom/DomNode.java +++ b/gnu/xml/dom/DomNode.java @@ -1120,7 +1120,6 @@ public abstract class DomNode node.appendChild(newChild); } } - if (nodeType == ENTITY_REFERENCE_NODE) { node.makeReadonly(); @@ -1556,23 +1555,30 @@ public abstract class DomNode ancestorLen = ancestors.length; } - // XXX autogrow ancestors ... based on statistics - // Climb to the top of this subtree and handle capture, letting // each node (from the top down) capture until one stops it or // until we get to this one. - - for (index = 0, current = parent; - current != null && index < ancestorLen; - index++, current = current.parent) + current = parent; + if (current.depth >= ANCESTORS_INIT) { + DomNode[] newants = new DomNode[current.depth + 1]; + System.arraycopy(ancestors, 0, newants, 0, ancestors.length); + ancestors = newants; + ancestorLen = ancestors.length; + } + for (index = 0; index < ancestorLen; index++) + { + if (current == null || current.depth == 0) + break; + if (current.nListeners != 0) { haveAncestorRegistrations = true; } ancestors [index] = current; + current = current.parent; } - if (current != null) + if (current.depth > 0) { throw new RuntimeException("dispatchEvent capture stack size"); } -- cgit v1.2.1