Changeset 62172 in webkit

Timestamp:

Jun 30, 2010 2:14:18 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-30 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

HTMLTokenizer needs EndOfFile support
​https://bugs.webkit.org/show_bug.cgi?id=41344

EndOfFile support uncovered a bug in our implementation of finish().
finish() may be called more than once if the first call does not
result in end() being called (and parsing thus actually stopping).

SegmentedString::close() should have ASSERTed that it was not already
closed when close() is called. I've added such an assert now.

• html/HTMLDocumentParser.cpp: (WebCore::HTMLDocumentParser::finish):
• platform/text/SegmentedString.cpp: (WebCore::SegmentedString::close):
• platform/text/SegmentedString.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLDocumentParser.cpp (modified) (1 diff)
• platform/text/SegmentedString.cpp (modified) (1 diff)
• platform/text/SegmentedString.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-30  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        HTMLTokenizer needs EndOfFile support
+        https://bugs.webkit.org/show_bug.cgi?id=41344
+
+        EndOfFile support uncovered a bug in our implementation of finish().
+        finish() may be called more than once if the first call does not
+        result in end() being called (and parsing thus actually stopping).
+
+        SegmentedString::close() should have ASSERTed that it was not already
+        closed when close() is called.  I've added such an assert now.
+
+        * html/HTMLDocumentParser.cpp:
+        (WebCore::HTMLDocumentParser::finish):
+        * platform/text/SegmentedString.cpp:
+        (WebCore::SegmentedString::close):
+        * platform/text/SegmentedString.h:
+
 2010-06-29  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/html/HTMLDocumentParser.cpp

@@ -291 +291 @@
 {
     // We're not going to get any more data off the network, so we tell the
-    // input stream we've reached the end of file.
-    m_input.markEndOfFile();
+    // input stream we've reached the end of file.  finish() can be called more
+    // than once, if the first time does not call end().
+    if (!m_input.haveSeenEndOfFile())
+        m_input.markEndOfFile();
     attemptToEnd();
 }

trunk/WebCore/platform/text/SegmentedString.cpp

@@ -123 +123 @@
 }
 
+void SegmentedString::close()
+{
+    // Closing a stream twice is likely a coding mistake.
+    ASSERT(!m_closed);
+    m_closed = true;
+}
+
 void SegmentedString::append(const SegmentedString &s)
 {

trunk/WebCore/platform/text/SegmentedString.h

@@ -83 +83 @@
 
     void clear();
-    void close() { m_closed = true; }
+    void close();
 
     void append(const SegmentedString&);