diff --git a/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java index 19b1c600f5c..1824fe82433 100644 --- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java +++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java @@ -703,6 +703,12 @@ class Parser implements DTDConstants { } if (!s.terminate() || (strict && !s.elem.omitEnd())) { break; + } else if (s.terminate()) { + // Since the current tag is not valid in current context + // as otherwise s.advance(elem) would have returned true + // so check if the stack is to be terminated + // in which case return false + return false; } } } diff --git a/test/jdk/javax/swing/text/html/parser/ParserStackOverflow.java b/test/jdk/javax/swing/text/html/parser/ParserStackOverflow.java new file mode 100644 index 00000000000..0e86879601d --- /dev/null +++ b/test/jdk/javax/swing/text/html/parser/ParserStackOverflow.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2022, 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. + */ +/* + * @test + * @bug 7172359 + * @summary Verifies HTML parser StackOverflowError on invalid HTML:
  • tag + * inside an