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

--HG-- extra : rebase_source : 8f83d4a619ff8893976db75f63b9ed81e4292e2f
2010-10-07 10:27:16 +03:00 · 2010-10-07 10:27:16 +03:00 · d9758ac3ac
--- a/parser/html/javasrc/Tokenizer.java
+++ b/parser/html/javasrc/Tokenizer.java
@ -6471,6 +6471,12 @@ public class Tokenizer implements Locator {
                    handleNcrValue(returnState);
                    state = returnState;
                    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:
                default:
                    break eofloop;
--- a/parser/html/nsHtml5Tokenizer.cpp
+++ b/parser/html/nsHtml5Tokenizer.cpp
@ -3684,6 +3684,14 @@ nsHtml5Tokenizer::eof()
        state = returnState;
        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:
      default: {
        NS_HTML5_BREAK(eofloop);
--- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/pending-spec-changes.dat
+++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/pending-spec-changes.dat
@ -1,17 +1,8 @@
 #data
-<svg><![CDATA[]]
+Placeholder
 #errors
 #document
 | <html>
 |   <head>
 |   <body>
-|     <svg svg>
-
-#data
-<svg><![CDATA[]
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
+|     "Placeholder"
--- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/tests21.dat
+++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/tests21.dat
@ -86,6 +86,26 @@
 |     <svg svg>
 |       "]] >"

+#data
+<svg><![CDATA[]]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]]"
+
+#data
+<svg><![CDATA[]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]"
+
 #data
 <svg><![CDATA[]>a
 #errors