Title: [255924] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 255924
- Author
- [email protected]
- Date
- 2020-02-06 07:10:05 -0800 (Thu, 06 Feb 2020)
Log Message
Merge r255849 - [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>
Reviewed by David Kilzer.
* UIProcess/Inspector/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::resetState):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (255923 => 255924)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:02 UTC (rev 255923)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:05 UTC (rev 255924)
@@ -1,5 +1,16 @@
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>
+
+ Reviewed by David Kilzer.
+
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::resetState):
+
+2020-02-05 Chris Dumez <[email protected]>
+
[IPC Hardening] Protect against bad RegistrableDomain under WebProcessProxy::didCollectPrewarmInformation()
https://bugs.webkit.org/show_bug.cgi?id=207281
<rdar://problem/55318108>
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (255923 => 255924)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-02-06 15:10:02 UTC (rev 255923)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-02-06 15:10:05 UTC (rev 255924)
@@ -186,6 +186,11 @@
void WebInspectorProxy::resetState()
{
+ ASSERT(m_inspectedPage);
+ ASSERT(m_inspectorPage);
+ if (!m_inspectedPage || !m_inspectorPage)
+ return;
+
inspectorPagePreferences().deleteInspectorAttachedHeight();
inspectorPagePreferences().deleteInspectorAttachedWidth();
inspectorPagePreferences().deleteInspectorAttachmentSide();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
