Title: [254310] trunk/Source/WebKit
- Revision
- 254310
- Author
- wilan...@apple.com
- Date
- 2020-01-09 15:47:34 -0800 (Thu, 09 Jan 2020)
Log Message
Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
https://bugs.webkit.org/show_bug.cgi?id=206035
<rdar://problem/58455306>
Reviewed by Brent Fulgham.
No new tests.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::setResourceLoadStatisticsEnabled):
Added a check that m_sessionID exists.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (254309 => 254310)
--- trunk/Source/WebKit/ChangeLog 2020-01-09 23:47:02 UTC (rev 254309)
+++ trunk/Source/WebKit/ChangeLog 2020-01-09 23:47:34 UTC (rev 254310)
@@ -1,3 +1,17 @@
+2020-01-09 John Wilander <wilan...@apple.com>
+
+ Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
+ https://bugs.webkit.org/show_bug.cgi?id=206035
+ <rdar://problem/58455306>
+
+ Reviewed by Brent Fulgham.
+
+ No new tests.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::setResourceLoadStatisticsEnabled):
+ Added a check that m_sessionID exists.
+
2020-01-09 Tim Horton <timothy_hor...@apple.com>
Install WebKit framework symlink for more iOS-derived platforms
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (254309 => 254310)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-09 23:47:02 UTC (rev 254309)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-01-09 23:47:34 UTC (rev 254310)
@@ -1630,7 +1630,7 @@
void WebProcess::setResourceLoadStatisticsEnabled(bool enabled)
{
- if (WebCore::DeprecatedGlobalSettings::resourceLoadStatisticsEnabled() == enabled || m_sessionID->isEphemeral())
+ if (WebCore::DeprecatedGlobalSettings::resourceLoadStatisticsEnabled() == enabled || (m_sessionID && m_sessionID->isEphemeral()))
return;
WebCore::DeprecatedGlobalSettings::setResourceLoadStatisticsEnabled(enabled);
#if ENABLE(RESOURCE_LOAD_STATISTICS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
