corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 601604 - Emit ]] or ] when ]]EOF or ]EOF appears in a CDATA section in text/html. rs=jonas, a=jst.

Browse Source
This commit is contained in:
Henri Sivonen
2010-10-07 10:27:16 +03:00
parent 38dff51029
commit 0c29bea23f
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parser/html/javasrc/Tokenizer.java
View File

@@ -6471,6 +6471,12 @@ public class Tokenizer implements Locator {
handleNcrValue(returnState); handleNcrValue(returnState);
state = returnState; state = returnState;
continue; continue;
case CDATA_RSQB:
tokenHandler.characters(Tokenizer.RSQB_RSQB, 0, 1);
break eofloop;
case CDATA_RSQB_RSQB:
tokenHandler.characters(Tokenizer.RSQB_RSQB, 0, 2);
break eofloop;
case DATA: case DATA:
default: default:
break eofloop; break eofloop;

8
parser/html/nsHtml5Tokenizer.cpp
View File

@@ -3684,6 +3684,14 @@ nsHtml5Tokenizer::eof()
state = returnState; state = returnState;
continue; continue;
} }
case NS_HTML5TOKENIZER_CDATA_RSQB: {
tokenHandler->characters(nsHtml5Tokenizer::RSQB_RSQB, 0, 1);
NS_HTML5_BREAK(eofloop);
}
case NS_HTML5TOKENIZER_CDATA_RSQB_RSQB: {
tokenHandler->characters(nsHtml5Tokenizer::RSQB_RSQB, 0, 2);
NS_HTML5_BREAK(eofloop);
}
case NS_HTML5TOKENIZER_DATA: case NS_HTML5TOKENIZER_DATA:
default: { default: {
NS_HTML5_BREAK(eofloop); NS_HTML5_BREAK(eofloop);

13
parser/htmlparser/tests/mochitest/html5lib_tree_construction/pending-spec-changes.dat
View File

@@ -1,17 +1,8 @@
#data #data
<svg><![CDATA[]] Placeholder
#errors #errors
#document #document
| <html> | <html>
| <head> | <head>
| <body> | <body>
| <svg svg> | "Placeholder"
#data
<svg><![CDATA[]
#errors
#document
| <html>
| <head>
| <body>
| <svg svg>

20
parser/htmlparser/tests/mochitest/html5lib_tree_construction/tests21.dat
View File

@@ -86,6 +86,26 @@
| <svg svg> | <svg svg>
| "]] >" | "]] >"
#data
<svg><![CDATA[]]
#errors
#document
| <html>
| <head>
| <body>
| <svg svg>
| "]]"
#data
<svg><![CDATA[]
#errors
#document
| <html>
| <head>
| <body>
| <svg svg>
| "]"
#data #data
<svg><![CDATA[]>a <svg><![CDATA[]>a
#errors #errors