Changeset 32901 in webkit

Timestamp:

May 5, 2008 10:01:24 PM (16 years ago)

Author:

mrowe@apple.com

Message:

Fix 60 crashes seen on the buildbots that were misreported as hangs.

Reviewed by Dan Bernstein.

• dom/Document.cpp:

(WebCore::Document::detachNodeIterator): Null-check page() before dereferencing it.
(WebCore::Document::nodeWillBeRemoved): Ditto.
(WebCore::Document::textInserted): Ditto.
(WebCore::Document::textNodesMerged): Ditto.
(WebCore::Document::textRemoved): Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-05  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Fix 60 crashes seen on the buildbots that were misreported as hangs.
+
+        * dom/Document.cpp:
+        (WebCore::Document::detachNodeIterator): Null-check page() before dereferencing it.
+        (WebCore::Document::nodeWillBeRemoved): Ditto.
+        (WebCore::Document::textInserted): Ditto.
+        (WebCore::Document::textNodesMerged): Ditto.
+        (WebCore::Document::textRemoved): Ditto.
+
 2008-05-05  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -2495 +2495 @@
 void Document::nodeChildrenChanged(ContainerNode* container)
 {
-    if (!page()->settings()->rangeMutationDisabledForOldAppleMail()) {
+    if (!page() || !page()->settings()->rangeMutationDisabledForOldAppleMail()) {
         HashSet<Range*>::const_iterator end = m_ranges.end();
         for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
@@ -2508 +2508 @@
         (*it)->nodeWillBeRemoved(n);
 
-    if (!page()->settings()->rangeMutationDisabledForOldAppleMail()) {
+    if (!page() || !page()->settings()->rangeMutationDisabledForOldAppleMail()) {
         HashSet<Range*>::const_iterator rangesEnd = m_ranges.end();
         for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != rangesEnd; ++it)
@@ -2522 +2522 @@
 void Document::textInserted(Node* text, unsigned offset, unsigned length)
 {
-    if (!page()->settings()->rangeMutationDisabledForOldAppleMail()) {
+    if (!page() || !page()->settings()->rangeMutationDisabledForOldAppleMail()) {
         HashSet<Range*>::const_iterator end = m_ranges.end();
         for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
@@ -2534 +2534 @@
 void Document::textRemoved(Node* text, unsigned offset, unsigned length)
 {
-    if (!page()->settings()->rangeMutationDisabledForOldAppleMail()) {
+    if (!page() || !page()->settings()->rangeMutationDisabledForOldAppleMail()) {
         HashSet<Range*>::const_iterator end = m_ranges.end();
         for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
@@ -2547 +2547 @@
 void Document::textNodesMerged(Text* oldNode, unsigned offset)
 {
-    if (!page()->settings()->rangeMutationDisabledForOldAppleMail()) {
+    if (!page() || !page()->settings()->rangeMutationDisabledForOldAppleMail()) {
         NodeWithIndex oldNodeWithIndex(oldNode);
         HashSet<Range*>::const_iterator end = m_ranges.end();
@@ -2559 +2559 @@
 void Document::textNodeSplit(Text* oldNode)
 {
-    if (!page()->settings()->rangeMutationDisabledForOldAppleMail()) {
+    if (!page() || !page()->settings()->rangeMutationDisabledForOldAppleMail()) {
         HashSet<Range*>::const_iterator end = m_ranges.end();
         for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)