8017492: Static field in HTML parser affects all applications
Reviewed-by: art
This commit is contained in:
parent
0b20e5e9af
commit
c934d0bd27
@ -170,8 +170,8 @@ public final class ContentModel implements Serializable {
|
||||
case '&': {
|
||||
Element e = (Element) token;
|
||||
if (valSet == null) {
|
||||
valSet = new boolean[Element.maxIndex + 1];
|
||||
val = new boolean[Element.maxIndex + 1];
|
||||
valSet = new boolean[Element.getMaxIndex() + 1];
|
||||
val = new boolean[valSet.length];
|
||||
// All Element instances are created before this ever executes
|
||||
}
|
||||
if (valSet[e.index]) {
|
||||
|
@ -28,6 +28,7 @@ package javax.swing.text.html.parser;
|
||||
import java.util.Hashtable;
|
||||
import java.util.BitSet;
|
||||
import java.io.*;
|
||||
import sun.awt.AppContext;
|
||||
|
||||
/**
|
||||
* An element as described in a DTD using the ELEMENT construct.
|
||||
@ -51,8 +52,6 @@ class Element implements DTDConstants, Serializable {
|
||||
public ContentModel content;
|
||||
public AttributeList atts;
|
||||
|
||||
static int maxIndex = 0;
|
||||
|
||||
/**
|
||||
* A field to store user data. Mostly used to store
|
||||
* style sheets.
|
||||
@ -68,7 +67,18 @@ class Element implements DTDConstants, Serializable {
|
||||
Element(String name, int index) {
|
||||
this.name = name;
|
||||
this.index = index;
|
||||
maxIndex = Math.max(maxIndex, index);
|
||||
if (index > getMaxIndex()) {
|
||||
AppContext.getAppContext().put(MAX_INDEX_KEY, index);
|
||||
}
|
||||
}
|
||||
|
||||
private static final Object MAX_INDEX_KEY = new Object();
|
||||
|
||||
static int getMaxIndex() {
|
||||
Integer value = (Integer) AppContext.getAppContext().get(MAX_INDEX_KEY);
|
||||
return (value != null)
|
||||
? value.intValue()
|
||||
: 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
92
jdk/test/javax/swing/text/html/parser/Test8017492.java
Normal file
92
jdk/test/javax/swing/text/html/parser/Test8017492.java
Normal file
@ -0,0 +1,92 @@
|
||||
/*
|
||||
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import java.util.Vector;
|
||||
import javax.swing.text.html.HTML;
|
||||
import javax.swing.text.html.HTMLDocument;
|
||||
import javax.swing.text.html.HTMLEditorKit;
|
||||
import javax.swing.text.html.parser.DTD;
|
||||
import javax.swing.text.html.parser.Element;
|
||||
import sun.awt.SunToolkit;
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8017492
|
||||
* @run main/othervm Test8017492
|
||||
* @summary Tests for OutOfMemoryError/NegativeArraySizeException
|
||||
* @author Sergey Malenkov
|
||||
*/
|
||||
|
||||
public class Test8017492 {
|
||||
public static void main(String[] args) throws Exception {
|
||||
Runnable task = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
SunToolkit.createNewAppContext();
|
||||
DTD dtd = DTD.getDTD("dtd");
|
||||
dtd.elements = new Vector<Element>() {
|
||||
@Override
|
||||
public synchronized int size() {
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
};
|
||||
dtd.getElement("element");
|
||||
}
|
||||
catch (Exception exception) {
|
||||
throw new Error("unexpected", exception);
|
||||
}
|
||||
}
|
||||
};
|
||||
// run task with different AppContext
|
||||
Thread thread = new Thread(new ThreadGroup("$$$"), task);
|
||||
thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
|
||||
@Override
|
||||
public void uncaughtException(Thread thread, Throwable throwable) {
|
||||
throwable.printStackTrace();
|
||||
System.exit(1);
|
||||
}
|
||||
});
|
||||
thread.start();
|
||||
thread.join();
|
||||
// add error handling
|
||||
HTMLDocument document = new HTMLDocument() {
|
||||
@Override
|
||||
public HTMLEditorKit.ParserCallback getReader(int pos) {
|
||||
return getReader(pos, 0, 0, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public HTMLEditorKit.ParserCallback getReader(int pos, int popDepth, int pushDepth, HTML.Tag insertTag) {
|
||||
return new HTMLDocument.HTMLReader(pos, popDepth, pushDepth, insertTag) {
|
||||
@Override
|
||||
public void handleError(String error, int pos) {
|
||||
throw new Error(error);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
// run parser
|
||||
new HTMLEditorKit().insertHTML(document, 0, "<html><body>text", 0, 0, null);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user