Title: [152858] trunk/Source/WebCore
Revision
152858
Author
[email protected]
Date
2013-07-18 11:58:52 -0700 (Thu, 18 Jul 2013)

Log Message

Crash in WebCore::createMarkup()
https://bugs.webkit.org/show_bug.cgi?id=118847

Reviewed by Ryosuke Niwa.

Also check that we have a containingBlock() for the renderer() so that we
may safely call node() on it.

* editing/markup.cpp:
(WebCore::highestAncestorToWrapMarkup):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (152857 => 152858)


--- trunk/Source/WebCore/ChangeLog	2013-07-18 18:54:14 UTC (rev 152857)
+++ trunk/Source/WebCore/ChangeLog	2013-07-18 18:58:52 UTC (rev 152858)
@@ -1,3 +1,16 @@
+2013-07-18  Antoine Quint  <[email protected]>
+
+        Crash in WebCore::createMarkup()
+        https://bugs.webkit.org/show_bug.cgi?id=118847
+
+        Reviewed by Ryosuke Niwa.
+
+        Also check that we have a containingBlock() for the renderer() so that we
+        may safely call node() on it.
+
+        * editing/markup.cpp:
+        (WebCore::highestAncestorToWrapMarkup):
+
 2013-07-18  Praveen R Jadhav  <[email protected]>
 
         Only the first call to 'stop' method of AudioBufferSourceNode must be entertained.

Modified: trunk/Source/WebCore/editing/markup.cpp (152857 => 152858)


--- trunk/Source/WebCore/editing/markup.cpp	2013-07-18 18:54:14 UTC (rev 152857)
+++ trunk/Source/WebCore/editing/markup.cpp	2013-07-18 18:58:52 UTC (rev 152858)
@@ -521,7 +521,7 @@
     }
 
     Node* checkAncestor = specialCommonAncestor ? specialCommonAncestor : commonAncestor;
-    if (checkAncestor->renderer()) {
+    if (checkAncestor->renderer() && checkAncestor->renderer()->containingBlock()) {
         Node* newSpecialCommonAncestor = highestEnclosingNodeOfType(firstPositionInNode(checkAncestor), &isElementPresentational, CanCrossEditingBoundary, checkAncestor->renderer()->containingBlock()->node());
         if (newSpecialCommonAncestor)
             specialCommonAncestor = newSpecialCommonAncestor;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to