infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-14 00:49:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

7011777: JDK 6 parses html text with script tags within comments differently from previous releases

Browse Source 
Reviewed-by: alexsch
This commit is contained in:
Dmitry Markov 2013-05-21 03:20:27 +04:00 committed by Mikhail Cherkasov
parent f894b19d50
commit d463e0c4ae
2 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/share/classes/javax/swing/text/html/parser/Parser.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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
@ -1980,11 +1980,12 @@ class Parser implements DTDConstants {
void parseScript() throws IOException {
char[] charsToAdd = new char[SCRIPT_END_TAG.length];
boolean insideComment = false;
/* Here, ch should be the first character after <script> */
while (true) {
int i = 0;
while (i < SCRIPT_END_TAG.length
while (!insideComment && i < SCRIPT_END_TAG.length
&& (SCRIPT_END_TAG[i] == ch
|| SCRIPT_END_TAG_UPPER_CASE[i] == ch)) {
charsToAdd[i] = (char) ch;
@ -2025,6 +2026,13 @@ class Parser implements DTDConstants {
break;
default:
addString(ch);
String str = new String(getChars(0, strpos));
if (!insideComment && str.endsWith(START_COMMENT)) {
insideComment = true;
}
if (insideComment && str.endsWith(END_COMMENT)) {
insideComment = false;
}
ch = readCh();
break;
} // switch

63
jdk/test/javax/swing/text/html/parser/Parser/7011777/bug7011777.java Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright (c) 2010, 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.
*/
/*
* @test
* @bug 7011777
* @summary Tests correct parsing of a HTML comment inside 'script' tags
* @author Dmitry Markov
*/
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.html.parser.ParserDelegator;
import java.io.StringReader;
public class bug7011777 {
static String comment = "<!--\n" +
"function foo() {\n" +
" var tag1 = \"</script>\";\n" +
" var tag2 = \"<div>\";\n" +
" var tag3 = \"</div>\";\n" +
" var tag4 = \"<script>\";\n" +
"}\n" +
"// -->";
static String html = "<script>" + comment + "</script>";
public static void main(String[] args) throws Exception {
new ParserDelegator().parse(new StringReader(html), new MyParserCallback(), true);
}
static class MyParserCallback extends HTMLEditorKit.ParserCallback {
@Override
public void handleComment(char[] data, int pos) {
String commentWithoutTags = comment.substring("<!--".length(), comment.length() - "-->".length());
String str = new String(data);
if (!commentWithoutTags.equals(str)) {
System.out.println("Sample string:\n" + commentWithoutTags);
System.out.println("Returned string:\n" + str);
throw new RuntimeException("Test Failed, sample and returned strings are mismatched!");
}
}
}
}