Changeset 89522 in webkit

Timestamp:

Jun 22, 2011, 7:31:11 PM (15 years ago)

Author:

weinig@apple.com

Message:

Lower HTML parser DOM depth limit to 2048
​https://bugs.webkit.org/show_bug.cgi?id=63219

Reviewed by Adam Barth.

Source/WebCore:

Lower the default depth limit from 4096 to 2048. There isn't a good
reason to have such pathologically nested content, and by-and-large,
the rendering code is not setup to support it that well. Adding this
aggressive limit now will allow us to see if anything breaks in the
nightlies.

• page/Settings.h:

LayoutTests:

Update nest test to reflect new limit and remove tests that were
testing specific behaviors of the old parser.

• fast/parser/block-nesting-cap-expected.txt:
• fast/parser/block-nesting-cap-table-expected.txt: Removed.
• fast/parser/block-nesting-cap-table.html: Removed.
• fast/parser/element-nesting-cap-expected.txt: Removed.
• fast/parser/element-nesting-cap.html: Removed.
• fast/parser/script-tests/block-nesting-cap-table.js: Removed.
• fast/parser/script-tests/block-nesting-cap.js:
• fast/parser/script-tests/element-nesting-cap.js: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/parser/block-nesting-cap-expected.txt (modified) (1 diff)
• LayoutTests/fast/parser/block-nesting-cap-table-expected.txt (deleted)
• LayoutTests/fast/parser/block-nesting-cap-table.html (deleted)
• LayoutTests/fast/parser/element-nesting-cap-expected.txt (deleted)
• LayoutTests/fast/parser/element-nesting-cap.html (deleted)
• LayoutTests/fast/parser/script-tests/block-nesting-cap-table.js (deleted)
• LayoutTests/fast/parser/script-tests/block-nesting-cap.js (modified) (2 diffs)
• LayoutTests/fast/parser/script-tests/element-nesting-cap.js (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Settings.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-22  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Lower HTML parser DOM depth limit to 2048
+        https://bugs.webkit.org/show_bug.cgi?id=63219
+
+        Update nest test to reflect new limit and remove tests that were
+        testing specific behaviors of the old parser.
+
+        * fast/parser/block-nesting-cap-expected.txt:
+        * fast/parser/block-nesting-cap-table-expected.txt: Removed.
+        * fast/parser/block-nesting-cap-table.html: Removed.
+        * fast/parser/element-nesting-cap-expected.txt: Removed.
+        * fast/parser/element-nesting-cap.html: Removed.
+        * fast/parser/script-tests/block-nesting-cap-table.js: Removed.
+        * fast/parser/script-tests/block-nesting-cap.js:
+        * fast/parser/script-tests/element-nesting-cap.js: Removed.
+
 2011-06-22  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/fast/parser/block-nesting-cap-expected.txt

@@ -1 @@
-Test that the HTML parser does not allow the nesting depth of "block-level" elements to exceed 4096.
+Test that the HTML parser does not allow the nesting depth of "block-level" elements to exceed 2048.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS d4096.parentNode === d4094 is true
-PASS d4095.parentNode === d4094 is true
-PASS d4096.previousSibling === d4095 is true
+PASS d2048.parentNode === d2046 is true
+PASS d2047.parentNode === d2046 is true
+PASS d2048.previousSibling === d2047 is true
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/parser/script-tests/block-nesting-cap.js

@@ -1 @@
-description('Test that the HTML parser does not allow the nesting depth of "block-level" elements to exceed 4096.');
+description('Test that the HTML parser does not allow the nesting depth of "block-level" elements to exceed 2048.');
 
-var depth = 4100;
+var depth = 2100;
 var markup = "";
 var i;
@@ -9 +9 @@
 doc.body.innerHTML = markup;
 
-var d4094 = doc.getElementById("d4094");
-var d4095 = doc.getElementById("d4095");
-var d4096 = doc.getElementById("d4096");
+var d2046 = doc.getElementById("d2046");
+var d2047 = doc.getElementById("d2047");
+var d2048 = doc.getElementById("d2048");
 
-shouldBe("d4096.parentNode === d4094", "true");
-shouldBe("d4095.parentNode === d4094", "true");
-shouldBe("d4096.previousSibling === d4095", "true");
+shouldBe("d2048.parentNode === d2046", "true");
+shouldBe("d2047.parentNode === d2046", "true");
+shouldBe("d2048.previousSibling === d2047", "true");
 
 var successfullyParsed = true;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-22  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Lower HTML parser DOM depth limit to 2048
+        https://bugs.webkit.org/show_bug.cgi?id=63219
+
+        Lower the default depth limit from 4096 to 2048. There isn't a good
+        reason to have such pathologically nested content, and by-and-large,
+        the rendering code is not setup to support it that well. Adding this
+        aggressive limit now will allow us to see if anything breaks in the
+        nightlies.
+
+        * page/Settings.h:
+
 2011-06-22  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/page/Settings.h

@@ -389 +389 @@
         bool usePreHTML5ParserQuirks() const { return m_usePreHTML5ParserQuirks; }
 
-        static const unsigned defaultMaximumHTMLParserDOMTreeDepth = 4096;
+        static const unsigned defaultMaximumHTMLParserDOMTreeDepth = 2048;
         void setMaximumHTMLParserDOMTreeDepth(unsigned maximumHTMLParserDOMTreeDepth) { m_maximumHTMLParserDOMTreeDepth = maximumHTMLParserDOMTreeDepth; }
         unsigned maximumHTMLParserDOMTreeDepth() const { return m_maximumHTMLParserDOMTreeDepth; }