Changeset 63393 in webkit

Timestamp:

Jul 14, 2010 7:40:22 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-07-14 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

HTMLTreeBuilder shouldn't crash during fast/parser/remove-parser-current-node.html
​https://bugs.webkit.org/show_bug.cgi?id=42312

We were crashing because of an ASSERT I added to the attach logic in
the HTMLConstructionSite. I knew this ASSERT was wrong when I added
it, I just wanted to make sure we had test coverage of those cases.
Turns out we do! :)

• html/HTMLConstructionSite.cpp: (WebCore::HTMLConstructionSite::attach): (WebCore::HTMLConstructionSite::attachAtSite):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLConstructionSite.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-14  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        HTMLTreeBuilder shouldn't crash during fast/parser/remove-parser-current-node.html
+        https://bugs.webkit.org/show_bug.cgi?id=42312
+
+        We were crashing because of an ASSERT I added to the attach logic in
+        the HTMLConstructionSite.  I knew this ASSERT was wrong when I added
+        it, I just wanted to make sure we had test coverage of those cases.
+        Turns out we do!  :)
+
+        * html/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::attach):
+        (WebCore::HTMLConstructionSite::attachAtSite):
+
 2010-07-14  Victor Wang  <victorw@chromium.org>
 

trunk/WebCore/html/HTMLConstructionSite.cpp

@@ -102 +102 @@
     // for elements), however, we'll get to use this ref in the stack of
     // open elements.
-    ASSERT(parent->attached());
-    ASSERT(!child->attached());
-    child->attach();
+    if (parent->attached()) {
+        ASSERT(!child->attached());
+        child->attach();
+    }
     return child.release();
 }
@@ -117 +118 @@
         site.parent->insertBefore(child, site.nextChild, ec);
         ASSERT(!ec);
-        ASSERT(site.parent->attached());
-        if (!child->attached())
+        if (site.parent->attached() && !child->attached())
             child->attach();
         return;
@@ -126 +126 @@
     // here to call attach().  We should investigate whether we can rely on
     // |site.parent| to hold a ref at this point.
-    ASSERT(site.parent->attached());
-    if (!child->attached())
+    if (site.parent->attached() && !child->attached())
         child->attach();
 }