7172359: HTML parser StackOverflowError on invalid HTML: <li> tag ins…

…ide an <option> Reviewed-by: tr, jdv, aivanov
openjdk · Oct 14, 2022 · 7133fc9 · 7133fc9
1 parent 3d75e88
commit 7133fc9
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 0 deletions.
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
@@ -703,6 +703,12 @@ boolean legalElementContext(Element elem) throws ChangedCharSetException {
                 }
                 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
@@ -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: <li> tag
+ *           inside an <option>
+ * @run main ParserStackOverflow
+ */
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+import java.io.StringReader;
+import java.io.Reader;
+
+public class ParserStackOverflow {
+    /*
+     * li element inside an option will crash javax.swing.text.html.parser.Parser
+     */
+    public static void main( String[] argv ) throws Exception {
+        String badHtml =
+         "<html><body><form><select><option><li></option></select></form></body></html>";
+
+        HTMLEditorKit kit = new HTMLEditorKit();
+        HTMLDocument doc = (HTMLDocument) kit.createDefaultDocument();
+        Reader reader = new StringReader(badHtml);
+        kit.read(reader, doc, 0); // StackOverflowError here
+
+        System.out.println("Succeeded! (no StackOverflowError)");
+    }
+}
+