Changeset 110646 in webkit

Timestamp:

Mar 13, 2012, 5:18:43 PM (15 years ago)

Author:

Simon Fraser

Message:

Fix potential crash when loading test results
​https://bugs.webkit.org/show_bug.cgi?id=81062
<rdar://problem/11041732>

Reviewed by Dean Jackson.

If RenderLayerBacking::isSimpleContainerCompositingLayer() is called early,
before the document has a documentElement(), then it crashes. Fix with
a null check on documentElement().

No test because it's timing dependent.

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix potential crash when loading test results
+        https://bugs.webkit.org/show_bug.cgi?id=81062
+        <rdar://problem/11041732>
+        
+        Reviewed by Dean Jackson.
+
+        If RenderLayerBacking::isSimpleContainerCompositingLayer() is called early,
+        before the document has a documentElement(), then it crashes. Fix with
+        a null check on documentElement().
+        
+        No test because it's timing dependent.
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
+
 2012-03-13  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -827 +827 @@
     if (renderObject->node() && renderObject->node()->isDocumentNode()) {
         // Look to see if the root object has a non-simple background
-        RenderObject* rootObject = renderObject->document()->documentElement()->renderer();
+        RenderObject* rootObject = renderObject->document()->documentElement() ? renderObject->document()->documentElement()->renderer() : 0;
         if (!rootObject)
             return false;