Changeset 62352 in webkit

Timestamp:

Jul 1, 2010 8:15:27 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-07-01 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

HTMLTokenizer should ASSERT that it never emits a null character
​https://bugs.webkit.org/show_bug.cgi?id=41448

No functional change, thus no tests. These ASSERTs would have
caught the coding error which caused the trouble in bug 41436
(which was fixed by bug 41439).

• html/HTMLToken.h: (WebCore::HTMLToken::beginStartTag): (WebCore::HTMLToken::beginCharacter): (WebCore::HTMLToken::beginDOCTYPE): (WebCore::HTMLToken::appendToName): (WebCore::HTMLToken::appendToComment): (WebCore::HTMLToken::appendToAttributeName): (WebCore::HTMLToken::appendToAttributeValue): (WebCore::HTMLToken::appendToPublicIdentifier): (WebCore::HTMLToken::appendToSystemIdentifier):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLToken.h (modified) (9 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-01  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        HTMLTokenizer should ASSERT that it never emits a null character
+        https://bugs.webkit.org/show_bug.cgi?id=41448
+
+        No functional change, thus no tests.  These ASSERTs would have
+        caught the coding error which caused the trouble in bug 41436
+        (which was fixed by bug 41439).
+
+        * html/HTMLToken.h:
+        (WebCore::HTMLToken::beginStartTag):
+        (WebCore::HTMLToken::beginCharacter):
+        (WebCore::HTMLToken::beginDOCTYPE):
+        (WebCore::HTMLToken::appendToName):
+        (WebCore::HTMLToken::appendToComment):
+        (WebCore::HTMLToken::appendToAttributeName):
+        (WebCore::HTMLToken::appendToAttributeValue):
+        (WebCore::HTMLToken::appendToPublicIdentifier):
+        (WebCore::HTMLToken::appendToSystemIdentifier):
+
 2010-07-01  Andreas Kling  <andreas.kling@nokia.com>
 

trunk/WebCore/html/HTMLToken.h

@@ -69 +69 @@
     void beginStartTag(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == Uninitialized);
         m_type = StartTag;
@@ -94 +95 @@
     void beginCharacter(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == Uninitialized);
         m_type = Character;
@@ -117 +119 @@
     void beginDOCTYPE(UChar character)
     {
+        ASSERT(character);
         beginDOCTYPE();
         m_data.append(character);
@@ -123 +126 @@
     void appendToName(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == StartTag || m_type == EndTag || m_type == DOCTYPE);
         m_data.append(character);
@@ -136 +140 @@
     void appendToComment(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == Comment);
         m_data.append(character);
@@ -149 +154 @@
     void appendToAttributeName(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == StartTag || m_type == EndTag);
         m_currentAttribute->m_name.append(character);
@@ -155 +161 @@
     void appendToAttributeValue(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == StartTag || m_type == EndTag);
         m_currentAttribute->m_value.append(character);
@@ -233 +240 @@
     void appendToPublicIdentifier(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == DOCTYPE);
         ASSERT(m_doctypeData->m_hasPublicIdentifier);
@@ -240 +248 @@
     void appendToSystemIdentifier(UChar character)
     {
+        ASSERT(character);
         ASSERT(m_type == DOCTYPE);
         ASSERT(m_doctypeData->m_hasSystemIdentifier);