Title: [242873] releases/WebKitGTK/webkit-2.24/Source/WebCore
- Revision
- 242873
- Author
- [email protected]
- Date
- 2019-03-13 02:25:28 -0700 (Wed, 13 Mar 2019)
Log 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (242872 => 242873)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-03-13 09:25:24 UTC (rev 242872)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog 2019-03-13 09:25:28 UTC (rev 242873)
@@ -1,3 +1,15 @@
+2019-03-13 Miguel Gomez <[email protected]>
+
+ [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 <[email protected]>
[WebGL] WebGLBuffer can be too large
Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (242872 => 242873)
--- releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2019-03-13 09:25:24 UTC (rev 242872)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2019-03-13 09:25:28 UTC (rev 242873)
@@ -978,7 +978,7 @@
void CoordinatedGraphicsLayer::setCoordinatorIncludingSubLayersIfNeeded(CoordinatedGraphicsLayerClient* coordinator)
{
- if (m_coordinator == coordinator)
+ if (!coordinator || m_coordinator == coordinator)
return;
// If the coordinators are different it means that we are attaching a layer that was created by a different
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
