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

Make CTextToken::ConsumeUntil not consume too much text. Bug 258082, patch by

Browse Source 
Blake Kaplan <mrbkap@rice.edu>, r=bzbarsky, sr=jst


git-svn-id: svn://10.0.0.236/trunk@162149 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-09-12 01:50:53 +00:00
parent 07e10f17ab
commit a5e5bcdb06
3 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
View File

@@ -752,12 +752,17 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
//if((eHTMLTag_style==theTag) || (eHTMLTag_script==theTag)) {
if(gHTMLElements[theTag].CanContainType(kCDATA)) {
nsAutoString endTagName;
endTagName.Assign(nsHTMLTags::GetStringValue(theTag));
nsDependentString endTagName(nsHTMLTags::GetStringValue(theTag));
CToken* text=theAllocator->CreateTokenOfType(eToken_text,eHTMLTag_text);
CTextToken* textToken=NS_STATIC_CAST(CTextToken*,text);
result=textToken->ConsumeUntil(0,theTag!=eHTMLTag_script,aScanner,endTagName,mFlags,aFlushTokens); //tell new token to finish consuming text...
//tell new token to finish consuming text...
result=textToken->ConsumeUntil(0,theTag!=eHTMLTag_script,
aScanner,
endTagName,
mFlags,
aFlushTokens);
// Fix bug 44186
// Support XML like syntax, i.e., <script src="external.js"/> == <script src="external.js"></script>
@@ -768,10 +773,31 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
// it is.
if((!(mFlags & NS_IPARSER_FLAG_PRESERVE_CONTENT) &&
!theStartToken->IsEmpty()) || aFlushTokens) {
theStartToken->SetEmpty(PR_FALSE); // Setting this would make cases like <script/>d.w("text");</script> work.
CToken* endToken=theAllocator->CreateTokenOfType(eToken_end,theTag,endTagName);
// Setting this would make cases like <script/>d.w("text");</script> work.
theStartToken->SetEmpty(PR_FALSE);
// do this up here so we can just add the end token later on
AddToken(text,result,&mTokenDeque,theAllocator);
AddToken(endToken,result,&mTokenDeque,theAllocator);
CToken* endToken=nsnull;
if (NS_SUCCEEDED(result) && aFlushTokens) {
PRUnichar theChar;
// Get the <
result = aScanner.GetChar(theChar);
NS_ASSERTION(NS_SUCCEEDED(result) && theChar == kLessThan,
"CTextToken::ConsumeUntil is broken!");
#ifdef DEBUG
// Ensure we have a /
PRUnichar tempChar; // Don't change non-debug vars in debug-only code
result = aScanner.Peek(tempChar);
NS_ASSERTION(NS_SUCCEEDED(result) && theChar == kForwardSlash,
"CTextToken::ConsumeUntil is broken!");
#endif
result = ConsumeEndTag(PRUnichar('/'),endToken,aScanner);
} else if (!(mFlags & NS_IPARSER_FLAG_VIEW_SOURCE)) {
endToken=theAllocator->CreateTokenOfType(eToken_end,theTag,endTagName);
AddToken(endToken,result,&mTokenDeque,theAllocator);
}
}
else {
IF_FREE(text, mTokenAllocator);