Title: [255928] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 255928
- Author
- [email protected]
- Date
- 2020-02-06 07:10:19 -0800 (Thu, 06 Feb 2020)
Log Message
Merge r255855 - [IPC hardening] Protect against m_inspectorPage being null inWebInspectorProxy::attach()
https://bugs.webkit.org/show_bug.cgi?id=207289
<rdar://problem/58419789>
Reviewed by David Kilzer.
* UIProcess/Inspector/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::attach):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (255927 => 255928)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:15 UTC (rev 255927)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-06 15:10:19 UTC (rev 255928)
@@ -1,5 +1,16 @@
2020-02-05 Chris Dumez <[email protected]>
+ [IPC hardening] Protect against m_inspectorPage being null inWebInspectorProxy::attach()
+ https://bugs.webkit.org/show_bug.cgi?id=207289
+ <rdar://problem/58419789>
+
+ Reviewed by David Kilzer.
+
+ * UIProcess/Inspector/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::attach):
+
+2020-02-05 Chris Dumez <[email protected]>
+
[IPC Hardening] Protect against m_inspectorPage being null in WebInspectorProxy::detach()
https://bugs.webkit.org/show_bug.cgi?id=207286
<rdar://problem/55422296>
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp (255927 => 255928)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-02-06 15:10:15 UTC (rev 255927)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Inspector/WebInspectorProxy.cpp 2020-02-06 15:10:19 UTC (rev 255928)
@@ -275,7 +275,8 @@
void WebInspectorProxy::attach(AttachmentSide side)
{
- if (!m_inspectedPage || !canAttach())
+ ASSERT(m_inspectorPage);
+ if (!m_inspectedPage || !m_inspectorPage || !canAttach())
return;
m_isAttached = true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
