Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 292733: Enforce that the the terminator for <![CDATA[ is ]]>, not ]>. This only affects view-source. r=bzbarsky sr+a=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@173021 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2005-05-03 23:33:42 +00:00
parent fb59007469
commit 143d0a488f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
View File

@@ -1036,20 +1036,22 @@ nsresult CCDATASectionToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt3
mTextValue.Append(aChar);
++mNewlineCount;
}
else if (kRightSquareBracket == aChar) {
else if (kRightSquareBracket == aChar) {
PRBool canClose = PR_FALSE;
result=aScanner.GetChar(aChar); //strip off the ]
mTextValue.Append(aChar);
result=aScanner.Peek(aChar); //then see what's next.
if((NS_OK==result) && (kRightSquareBracket==aChar)) {
result=aScanner.GetChar(aChar); //strip off the second ]
mTextValue.Append(aChar);
canClose = PR_TRUE;
}
// The goal here is to not lose data from the page when encountering
// markup like: <![endif]-->. This means that in normal parsing, we
// allow ']' to end the marked section and just drop everything between
// it an the '>'. In view-source mode, we cannot drop things on the
// floor like that. In fact, to make view-source of XML with script in
// CDATA sections at all bearable, we need to somewhat enforce the ']>'
// CDATA sections at all bearable, we need to somewhat enforce the ']]>'
// terminator for marked sections. So make the tokenization somewhat
// different when in view-source _and_ dealing with a CDATA section.
PRBool inCDATA = (aFlag & NS_IPARSER_FLAG_VIEW_SOURCE) &&
@@ -1061,7 +1063,7 @@ nsresult CCDATASectionToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt3
result=aScanner.ReadUntil(dummy,kGreaterThan,PR_FALSE);
}
if (NS_OK==result &&
(!inCDATA || kGreaterThan == aChar)) {
(!inCDATA || (canClose && kGreaterThan == aChar))) {
result=aScanner.GetChar(aChar); //strip off the >
done=PR_TRUE;
}