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

bug 7604 - limit colspan to max of 1000

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47151 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
1999-09-13 20:18:33 +00:00
parent bd5415615c
commit d3ebc3a0ff
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,6 +327,8 @@ static nsGenericHTMLElement::EnumTable kCellScopeTable[] = {
{ 0 }
};
#define MAX_COLSPAN 1000
NS_IMETHODIMP
nsHTMLTableCellElement::StringToAttribute(nsIAtom* aAttribute,
const nsString& aValue,
@@ -346,6 +348,11 @@ nsHTMLTableCellElement::StringToAttribute(nsIAtom* aAttribute,
else if ((aAttribute == nsHTMLAtoms::colspan) ||
(aAttribute == nsHTMLAtoms::rowspan)) {
if (nsGenericHTMLElement::ParseValue(aValue, 1, aResult, eHTMLUnit_Integer)) {
PRInt32 val = aResult.GetIntValue();
if (val > MAX_COLSPAN) {
nsHTMLUnit unit = aResult.GetUnit();
aResult.SetIntValue(MAX_COLSPAN, unit);
}
return NS_CONTENT_ATTR_HAS_VALUE;
}
}

7
mozilla/layout/html/content/src/nsHTMLTableCellElement.cpp
View File

@@ -327,6 +327,8 @@ static nsGenericHTMLElement::EnumTable kCellScopeTable[] = {
{ 0 }
};
#define MAX_COLSPAN 1000
NS_IMETHODIMP
nsHTMLTableCellElement::StringToAttribute(nsIAtom* aAttribute,
const nsString& aValue,
@@ -346,6 +348,11 @@ nsHTMLTableCellElement::StringToAttribute(nsIAtom* aAttribute,
else if ((aAttribute == nsHTMLAtoms::colspan) ||
(aAttribute == nsHTMLAtoms::rowspan)) {
if (nsGenericHTMLElement::ParseValue(aValue, 1, aResult, eHTMLUnit_Integer)) {
PRInt32 val = aResult.GetIntValue();
if (val > MAX_COLSPAN) {
nsHTMLUnit unit = aResult.GetUnit();
aResult.SetIntValue(MAX_COLSPAN, unit);
}
return NS_CONTENT_ATTR_HAS_VALUE;
}
}