Title: [89258] trunk
- Revision
- 89258
- Author
- [email protected]
- Date
- 2011-06-20 10:51:40 -0700 (Mon, 20 Jun 2011)
Log Message
2011-06-20 Adam Barth <[email protected]>
Reviewed by Alexey Proskuryakov.
ASSERT in WebCore::HTMLToken::appendToAttributeName when visiting www.nba.com
https://bugs.webkit.org/show_bug.cgi?id=61774
* fast/parser/attributes-on-close-script-expected.txt: Added.
* fast/parser/attributes-on-close-script.html: Added.
2011-06-20 Adam Barth <[email protected]>
Reviewed by Alexey Proskuryakov.
ASSERT in WebCore::HTMLToken::appendToAttributeName when visiting www.nba.com
https://bugs.webkit.org/show_bug.cgi?id=61774
This ASSERT triggers for the same underlying issue that causes
Bug 62971: When we tokenize a </script> tag, we don't realize that
we've already consumed the "</script>" from the input stream when we
extracted the previous token. That causes the source tracker to be
out-of-sync, triggering the incorrect view-source highlighting and this
ASSERT.
For now, let's just silence the assert while we work on Bug 62971.
Test: fast/parser/attributes-on-close-script.html
* html/parser/HTMLToken.h:
(WebCore::HTMLToken::appendToAttributeName):
(WebCore::AtomicHTMLToken::initializeAttributes):
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (89257 => 89258)
--- trunk/LayoutTests/ChangeLog 2011-06-20 17:49:34 UTC (rev 89257)
+++ trunk/LayoutTests/ChangeLog 2011-06-20 17:51:40 UTC (rev 89258)
@@ -1,3 +1,13 @@
+2011-06-20 Adam Barth <[email protected]>
+
+ Reviewed by Alexey Proskuryakov.
+
+ ASSERT in WebCore::HTMLToken::appendToAttributeName when visiting www.nba.com
+ https://bugs.webkit.org/show_bug.cgi?id=61774
+
+ * fast/parser/attributes-on-close-script-expected.txt: Added.
+ * fast/parser/attributes-on-close-script.html: Added.
+
2011-06-20 Juan C. Montemayor <[email protected]>
Reviewed by Oliver Hunt.
Added: trunk/LayoutTests/fast/parser/attributes-on-close-script-expected.txt (0 => 89258)
--- trunk/LayoutTests/fast/parser/attributes-on-close-script-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/parser/attributes-on-close-script-expected.txt 2011-06-20 17:51:40 UTC (rev 89258)
@@ -0,0 +1,14 @@
+ALERT: PASS (as long as this test doesn't trigger an ASSERT)
+| <html>
+| <head>
+| <script>
+| src=""
+| "
+"
+| <script>
+| "
+alert("PASS (as long as this test doesn't trigger an ASSERT)");
+"
+| "
+"
+| <body>
Added: trunk/LayoutTests/fast/parser/attributes-on-close-script.html (0 => 89258)
--- trunk/LayoutTests/fast/parser/attributes-on-close-script.html (rev 0)
+++ trunk/LayoutTests/fast/parser/attributes-on-close-script.html 2011-06-20 17:51:40 UTC (rev 89258)
@@ -0,0 +1,4 @@
+<script src=""
+<script>
+alert("PASS (as long as this test doesn't trigger an ASSERT)");
+</script class="value">
Modified: trunk/Source/WebCore/ChangeLog (89257 => 89258)
--- trunk/Source/WebCore/ChangeLog 2011-06-20 17:49:34 UTC (rev 89257)
+++ trunk/Source/WebCore/ChangeLog 2011-06-20 17:51:40 UTC (rev 89258)
@@ -1,3 +1,25 @@
+2011-06-20 Adam Barth <[email protected]>
+
+ Reviewed by Alexey Proskuryakov.
+
+ ASSERT in WebCore::HTMLToken::appendToAttributeName when visiting www.nba.com
+ https://bugs.webkit.org/show_bug.cgi?id=61774
+
+ This ASSERT triggers for the same underlying issue that causes
+ Bug 62971: When we tokenize a </script> tag, we don't realize that
+ we've already consumed the "</script>" from the input stream when we
+ extracted the previous token. That causes the source tracker to be
+ out-of-sync, triggering the incorrect view-source highlighting and this
+ ASSERT.
+
+ For now, let's just silence the assert while we work on Bug 62971.
+
+ Test: fast/parser/attributes-on-close-script.html
+
+ * html/parser/HTMLToken.h:
+ (WebCore::HTMLToken::appendToAttributeName):
+ (WebCore::AtomicHTMLToken::initializeAttributes):
+
2011-06-20 Andras Becsi <[email protected]>
Unreviewed build fix.
Modified: trunk/Source/WebCore/html/parser/HTMLToken.h (89257 => 89258)
--- trunk/Source/WebCore/html/parser/HTMLToken.h 2011-06-20 17:49:34 UTC (rev 89257)
+++ trunk/Source/WebCore/html/parser/HTMLToken.h 2011-06-20 17:51:40 UTC (rev 89258)
@@ -210,7 +210,9 @@
{
ASSERT(character);
ASSERT(m_type == StartTag || m_type == EndTag);
- ASSERT(m_currentAttribute->m_nameRange.m_start);
+ // FIXME: We should be able to add the following ASSERT once we fix
+ // https://bugs.webkit.org/show_bug.cgi?id=62971
+ // ASSERT(m_currentAttribute->m_nameRange.m_start);
m_currentAttribute->m_name.append(character);
}
@@ -545,7 +547,9 @@
if (attribute.m_name.isEmpty())
continue;
- ASSERT(attribute.m_nameRange.m_start);
+ // FIXME: We should be able to add the following ASSERT once we fix
+ // https://bugs.webkit.org/show_bug.cgi?id=62971
+ // ASSERT(attribute.m_nameRange.m_start);
ASSERT(attribute.m_nameRange.m_end);
ASSERT(attribute.m_valueRange.m_start);
ASSERT(attribute.m_valueRange.m_end);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
