Changeset 242873 in webkit

Timestamp:

Mar 13, 2019, 2:25:28 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r242864 - [CoordinatedGraphics] Null dereference in CoordinatedGraphicsLayer::setCoordinatorIncludingSubLayersIfNeeded
​https://bugs.webkit.org/show_bug.cgi?id=195615

Reviewed by Carlos Garcia Campos.

Exit early if we don't receive a valid coordinator.

• platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::setCoordinatorIncludingSubLayersIfNeeded):

Location:

releases/WebKitGTK/webkit-2.24/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-13  Miguel Gomez  <magomez@igalia.com>
+
+        [CoordinatedGraphics] Null dereference in CoordinatedGraphicsLayer::setCoordinatorIncludingSubLayersIfNeeded
+        https://bugs.webkit.org/show_bug.cgi?id=195615
+
+        Reviewed by Carlos Garcia Campos.
+
+        Exit early if we don't receive a valid coordinator.
+
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::setCoordinatorIncludingSubLayersIfNeeded):
+
 2019-03-12  Dean Jackson  <dino@apple.com>
 

releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

@@ -979 +979 @@
 void CoordinatedGraphicsLayer::setCoordinatorIncludingSubLayersIfNeeded(CoordinatedGraphicsLayerClient* coordinator)
 {
-    if (m_coordinator == coordinator)
+    if (!coordinator || m_coordinator == coordinator)
         return;