Title: [255925] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 255925
- Author
- [email protected]
- Date
- 2020-02-06 07:10:08 -0800 (Thu, 06 Feb 2020)
Log Message
Merge r255850 - [IPC Hardening] Protect against m_inspectorPage being null in WebInspectorProxy::setAttachedWindowHeight() / setAttachedWindowWidth()
https://bugs.webkit.org/show_bug.cgi?id=207287
<rdar://problem/55422919>
Reviewed by Geoffrey Garen.
* UIProcess/Inspector/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::setAttachedWindowHeight):
(WebKit::WebInspectorProxy::setAttachedWindowWidth):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (255924 => 255925)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:05 UTC (rev 255924)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:08 UTC (rev 255925)
@@ -1,5 +1,17 @@
2020-02-05 Chris Dumez <[email protected]>
+ [IPC Hardening] Protect against m_inspectorPage being null in WebInspectorProxy::setAttachedWindowHeight() / setAttachedWindowWidth()
+ https://bugs.webkit.org/show_bug.cgi?id=207287
+ <rdar://problem/55422919>
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::setAttachedWindowHeight):
+ (WebKit::WebInspectorProxy::setAttachedWindowWidth):
+
+2020-02-05 Chris Dumez <[email protected]>
+
[IPC Hardening] Protect against m_inspectedPage / m_inspectorPage being null in WebInspectorProxy::resetState()
https://bugs.webkit.org/show_bug.cgi?id=207285
<rdar://problem/55420035>
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (255924 => 255925)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-02-06 15:10:05 UTC (rev 255924)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-02-06 15:10:08 UTC (rev 255925)
@@ -323,6 +323,10 @@
void WebInspectorProxy::setAttachedWindowHeight(unsigned height)
{
+ ASSERT(m_inspectorPage);
+ if (!m_inspectorPage)
+ return;
+
inspectorPagePreferences().setInspectorAttachedHeight(height);
platformSetAttachedWindowHeight(height);
}
@@ -329,6 +333,10 @@
void WebInspectorProxy::setAttachedWindowWidth(unsigned width)
{
+ ASSERT(m_inspectorPage);
+ if (!m_inspectorPage)
+ return;
+
inspectorPagePreferences().setInspectorAttachedWidth(width);
platformSetAttachedWindowWidth(width);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
