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

large colspan protection as other browsers do, bug 141818 r/sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165397 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bmlk%gmx.de
2004-11-16 15:46:55 +00:00
parent 87b5cad1f0
commit 48abb664b4
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
View File

@@ -263,7 +263,8 @@ static const nsHTMLValue::EnumTable kCellScopeTable[] = {
{ 0 }
};
#define MAX_COLROWSPAN 8190 // celldata.h can not handle more
#define MAX_ROWSPAN 8190 // celldata.h can not handle more
#define MAX_COLSPAN 1000 // limit as IE and opera do
PRBool
nsHTMLTableCellElement::ParseAttribute(nsIAtom* aAttribute,
@@ -277,9 +278,20 @@ nsHTMLTableCellElement::ParseAttribute(nsIAtom* aAttribute,
/* attributes that resolve to integers with a min of 0 */
return aResult.ParseIntWithBounds(aValue, 0);
}
else if ((aAttribute == nsHTMLAtoms::colspan) ||
(aAttribute == nsHTMLAtoms::rowspan)) {
PRBool res = aResult.ParseIntWithBounds(aValue, -1, MAX_COLROWSPAN);
if (aAttribute == nsHTMLAtoms::colspan) {
PRBool res = aResult.ParseIntWithBounds(aValue, -1);
if (res) {
PRInt32 val = aResult.GetIntegerValue();
// reset large colspan values as IE and opera do
// quirks mode does not honor the special html 4 value of 0
if (val > MAX_COLSPAN || val < 0 || (0 == val && InNavQuirksMode(GetOwnerDoc()))) {
aResult.SetTo(1, nsAttrValue::eInteger);
}
}
return res;
}
if (aAttribute == nsHTMLAtoms::rowspan) {
PRBool res = aResult.ParseIntWithBounds(aValue, -1, MAX_ROWSPAN);
if (res) {
PRInt32 val = aResult.GetIntegerValue();
// quirks mode does not honor the special html 4 value of 0