Changeset 31080 in webkit

Timestamp:

Mar 16, 2008 1:15:41 PM (16 years ago)

Author:

Darin Adler

Message:

2008-03-16 Darin Adler <Darin Adler>

Reviewed by Mitz.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17876 Attempting to visit Ofcom page causes crash

This is causing intermittent crashes on some existing test cases on the buildbot
too; I don't have a 100% test case right now, but it should be easy to add one later
and this does fix a crash in a test we already have.

• dom/CharacterData.cpp: (WebCore::CharacterData::CharacterData): Initialize m_data to the empty string, not the null string. The class assumes the string can never being null. (WebCore::CharacterData::setData): If asked to set the data to the null string, set it to the empty string instead. This matches what the (non-empty) constructor has always done.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/CharacterData.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-16  Darin Adler  <darin@apple.com>
+
+        Reviewed by Mitz.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17876
+          Attempting to visit Ofcom page causes crash
+
+        This is causing intermittent crashes on some existing test cases on the buildbot
+        too; I don't have a 100% test case right now, but it should be easy to add one later
+        and this does fix a crash in a test we already have.
+
+        * dom/CharacterData.cpp:
+        (WebCore::CharacterData::CharacterData): Initialize m_data to the empty string,
+        not the null string. The class assumes the string can never being null.
+        (WebCore::CharacterData::setData): If asked to set the data to the null string,
+        set it to the empty string instead. This matches what the (non-empty) constructor
+        has always done.
+
 2008-03-15  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/dom/CharacterData.cpp

@@ -36 +36 @@
 CharacterData::CharacterData(Document *doc)
     : EventTargetNode(doc)
+    , m_data(StringImpl::empty())
 {
 }
@@ -57 +58 @@
     }
 
-    if (equal(m_data.get(), data.impl()))
+    StringImpl* dataImpl = data.impl() ? data.impl() : StringImpl::empty();
+    if (equal(m_data.get(), dataImpl))
         return;
 
     int oldLength = length();
     RefPtr<StringImpl> oldStr = m_data;
-    m_data = data.impl();
+    m_data = dataImpl;
     
     if ((!renderer() || !rendererIsNeeded(renderer()->style())) && attached()) {