mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Avoid recursion after parsing CSS comments. (Bug 473914) r+sr=bzbarsky

This commit is contained in:
L. David Baron 2009-01-16 19:44:21 -08:00
Родитель 4dc922bd27
Коммит 4687ab4bb6
3 изменённых файлов: 133 добавлений и 104 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
layout/style/crashtests/473914-1.html Normal file
Просмотреть файл

@ -0,0 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<style id="s"></style>
<script type="text/javascript">
// Duplicates the string 2^n times
function exp(s, n)
{
for (var i = 0; i < n; ++i)
s += s;
return s;
}
var stylesheet = exp("/**/", 20);
document.getElementById("s").textContent = stylesheet;
</script>
</head>
<body>
<div></div>
</body>
</html>

1
layout/style/crashtests/crashtests.list
Просмотреть файл

@ -27,4 +27,5 @@ load 460217-1.html
load 466845-1.html load 466845-1.html
HTTP(..) load 472237-1.html HTTP(..) load 472237-1.html
load 473720-1.html load 473720-1.html
load 473914-1.html
load long-url-list-stack-overflow.html load long-url-list-stack-overflow.html

213
layout/style/nsCSSScanner.cpp
Просмотреть файл

@ -707,130 +707,135 @@ nsCSSScanner::EatNewline()
PRBool PRBool
nsCSSScanner::Next(nsCSSToken& aToken) nsCSSScanner::Next(nsCSSToken& aToken)
{ {
PRInt32 ch = Read(); for (;;) { // Infinite loop so we can restart after comments.
if (ch < 0) { PRInt32 ch = Read();
return PR_FALSE; if (ch < 0) {
} return PR_FALSE;
// IDENT
if (StartsIdent(ch, Peek()))
return ParseIdent(ch, aToken);
// AT_KEYWORD
if (ch == '@') {
PRInt32 nextChar = Read();
if (nextChar >= 0) {
PRInt32 followingChar = Peek();
Pushback(nextChar);
if (StartsIdent(nextChar, followingChar))
return ParseAtKeyword(ch, aToken);
} }
}
// NUMBER or DIM // IDENT
if ((ch == '.') || (ch == '+') || (ch == '-')) { if (StartsIdent(ch, Peek()))
PRInt32 nextChar = Peek(); return ParseIdent(ch, aToken);
if (IsDigit(nextChar)) {
// AT_KEYWORD
if (ch == '@') {
PRInt32 nextChar = Read();
if (nextChar >= 0) {
PRInt32 followingChar = Peek();
Pushback(nextChar);
if (StartsIdent(nextChar, followingChar))
return ParseAtKeyword(ch, aToken);
}
}
// NUMBER or DIM
if ((ch == '.') || (ch == '+') || (ch == '-')) {
PRInt32 nextChar = Peek();
if (IsDigit(nextChar)) {
return ParseNumber(ch, aToken);
}
else if (('.' == nextChar) && ('.' != ch)) {
nextChar = Read();
PRInt32 followingChar = Peek();
Pushback(nextChar);
if (IsDigit(followingChar))
return ParseNumber(ch, aToken);
}
}
if (IsDigit(ch)) {
return ParseNumber(ch, aToken); return ParseNumber(ch, aToken);
} }
else if (('.' == nextChar) && ('.' != ch)) {
nextChar = Read(); // ID
PRInt32 followingChar = Peek(); if (ch == '#') {
Pushback(nextChar); return ParseRef(ch, aToken);
if (IsDigit(followingChar))
return ParseNumber(ch, aToken);
} }
}
if (IsDigit(ch)) {
return ParseNumber(ch, aToken);
}
// ID // STRING
if (ch == '#') { if ((ch == '"') || (ch == '\'')) {
return ParseRef(ch, aToken); return ParseString(ch, aToken);
} }
// STRING // WS
if ((ch == '"') || (ch == '\'')) { if (IsWhitespace(ch)) {
return ParseString(ch, aToken); aToken.mType = eCSSToken_WhiteSpace;
}
// WS
if (IsWhitespace(ch)) {
aToken.mType = eCSSToken_WhiteSpace;
aToken.mIdent.Assign(PRUnichar(ch));
(void) EatWhiteSpace();
return PR_TRUE;
}
if (ch == '/') {
PRInt32 nextChar = Peek();
if (nextChar == '*') {
(void) Read();
#if 0
// If we change our storage data structures such that comments are
// stored (for Editor), we should reenable this code, condition it
// on being in editor mode, and apply glazou's patch from bug
// 60290.
aToken.mIdent.SetCapacity(2);
aToken.mIdent.Assign(PRUnichar(ch)); aToken.mIdent.Assign(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar)); (void) EatWhiteSpace();
return ParseCComment(aToken); return PR_TRUE;
#endif
return SkipCComment() && Next(aToken);
} }
} if (ch == '/') {
if (ch == '<') { // consume HTML comment tags PRInt32 nextChar = Peek();
if (LookAhead('!')) { if (nextChar == '*') {
if (LookAhead('-')) { (void) Read();
#if 0
// If we change our storage data structures such that comments are
// stored (for Editor), we should reenable this code, condition it
// on being in editor mode, and apply glazou's patch from bug
// 60290.
aToken.mIdent.SetCapacity(2);
aToken.mIdent.Assign(PRUnichar(ch));
aToken.mIdent.Append(PRUnichar(nextChar));
return ParseCComment(aToken);
#endif
if (!SkipCComment()) {
return PR_FALSE;
}
continue; // start again at the beginning
}
}
if (ch == '<') { // consume HTML comment tags
if (LookAhead('!')) {
if (LookAhead('-')) { if (LookAhead('-')) {
if (LookAhead('-')) {
aToken.mType = eCSSToken_HTMLComment;
aToken.mIdent.AssignLiteral("<!--");
return PR_TRUE;
}
Pushback('-');
}
Pushback('!');
}
}
if (ch == '-') { // check for HTML comment end
if (LookAhead('-')) {
if (LookAhead('>')) {
aToken.mType = eCSSToken_HTMLComment; aToken.mType = eCSSToken_HTMLComment;
aToken.mIdent.AssignLiteral("<!--"); aToken.mIdent.AssignLiteral("-->");
return PR_TRUE; return PR_TRUE;
} }
Pushback('-'); Pushback('-');
} }
Pushback('!');
} }
}
if (ch == '-') { // check for HTML comment end
if (LookAhead('-')) {
if (LookAhead('>')) {
aToken.mType = eCSSToken_HTMLComment;
aToken.mIdent.AssignLiteral("-->");
return PR_TRUE;
}
Pushback('-');
}
}
// INCLUDES ("~=") and DASHMATCH ("|=") // INCLUDES ("~=") and DASHMATCH ("|=")
if (( ch == '|' ) || ( ch == '~' ) || ( ch == '^' ) || if (( ch == '|' ) || ( ch == '~' ) || ( ch == '^' ) ||
( ch == '$' ) || ( ch == '*' )) { ( ch == '$' ) || ( ch == '*' )) {
PRInt32 nextChar = Read(); PRInt32 nextChar = Read();
if ( nextChar == '=' ) { if ( nextChar == '=' ) {
if (ch == '~') { if (ch == '~') {
aToken.mType = eCSSToken_Includes; aToken.mType = eCSSToken_Includes;
}
else if (ch == '|') {
aToken.mType = eCSSToken_Dashmatch;
}
else if (ch == '^') {
aToken.mType = eCSSToken_Beginsmatch;
}
else if (ch == '$') {
aToken.mType = eCSSToken_Endsmatch;
}
else if (ch == '*') {
aToken.mType = eCSSToken_Containsmatch;
}
return PR_TRUE;
} else if (nextChar >= 0) {
Pushback(nextChar);
} }
else if (ch == '|') {
aToken.mType = eCSSToken_Dashmatch;
}
else if (ch == '^') {
aToken.mType = eCSSToken_Beginsmatch;
}
else if (ch == '$') {
aToken.mType = eCSSToken_Endsmatch;
}
else if (ch == '*') {
aToken.mType = eCSSToken_Containsmatch;
}
return PR_TRUE;
} else if (nextChar >= 0) {
Pushback(nextChar);
} }
aToken.mType = eCSSToken_Symbol;
aToken.mSymbol = ch;
return PR_TRUE;
} }
aToken.mType = eCSSToken_Symbol;
aToken.mSymbol = ch;
return PR_TRUE;
} }
PRBool PRBool