changeset 16993:79e099ab284b

8177450: javax.swing.text.html.parser.Parser parseScript ignores a character after commend end Reviewed-by: prr, alexsch
author mcherkas
date Tue, 11 Apr 2017 00:05:00 +0300
parents c69e8ca0008e
children b289db56c862 457e37c68608
files src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/test.html
diffstat 3 files changed, 79 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java	Mon Apr 10 09:05:24 2017 -0700
+++ b/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java	Tue Apr 11 00:05:00 2017 +0300
@@ -2119,8 +2119,11 @@
             }
 
             /* To account for extra read()'s that happened */
-            for (int j = 0; j < i; j++) {
-                addString(charsToAdd[j]);
+            if (i > 0) {
+                for (int j = 0; j < i; j++) {
+                    addString(charsToAdd[j]);
+                }
+                continue;
             }
             switch (ch) {
             case -1:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/HtmlCommentTagParseTest.java	Tue Apr 11 00:05:00 2017 +0300
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) 2017, 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 javax.swing.*;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTMLDocument;
+import javax.swing.text.html.HTMLEditorKit;
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+
+/* @test
+   @bug 8177450
+   @summary  javax.swing.text.html.parser.Parser parseScript ignores a character after commend end
+   @author Mikhail Cherkasov
+   @run main HtmlCommentTagParseTest
+*/
+public class HtmlCommentTagParseTest {
+    private static volatile boolean failed = false;
+    public static void main(String[] args) throws IOException, InvocationTargetException, InterruptedException {
+        SwingUtilities.invokeAndWait(() -> {
+                MyParser cb = new MyParser();
+                HTMLEditorKit htmlKit = new HTMLEditorKit();
+                HTMLDocument htmlDoc = (HTMLDocument)
+                        htmlKit.createDefaultDocument();
+            FileReader reader = null;
+            try {
+                reader = new FileReader(getDirURL() + "test.html");
+                htmlDoc.getParser().parse(reader, cb, true);
+                if(failed) {
+                    throw new RuntimeException("Test failed");
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+    private static String getDirURL() {
+        return new File(System.getProperty("test.src", ".")).getAbsolutePath() +
+                File.separator;
+    }
+
+    private static class MyParser extends HTMLEditorKit.ParserCallback {
+        @Override
+        public void handleError(String errorMsg, int pos) {
+            failed = errorMsg.contains("eof.script");
+        }
+    }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/text/html/parser/Parser/HtmlCommentTagParseTest/test.html	Tue Apr 11 00:05:00 2017 +0300
@@ -0,0 +1,5 @@
+<html>
+<body>
+<script><!-- --></script>
+</body>
+</html>
\ No newline at end of file