Title: [241708] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 241708
- Author
- carlo...@webkit.org
- Date
- 2019-02-18 08:16:28 -0800 (Mon, 18 Feb 2019)
Log Message
Merge r241641 - NetworkDataTask should check its client before calling shouldCaptureExtraNetworkLoadMetrics
https://bugs.webkit.org/show_bug.cgi?id=194732
Reviewed by Geoffrey Garen.
NetworkDataTask may be kept alive if refing it after its NetworkLoad is gone.
This might happen for instance in DownloadManager or when checking for TLS certificates.
In that case, if the NetworkLoad gets destroyed, it clears the client of the NetworkDataTask.
To ensure that NetworkDataTask does not try to use its client, add a null check.
* NetworkProcess/NetworkDataTask.cpp:
(WebKit::NetworkDataTask::shouldCaptureExtraNetworkLoadMetrics const):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (241707 => 241708)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-18 16:16:24 UTC (rev 241707)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-18 16:16:28 UTC (rev 241708)
@@ -1,5 +1,20 @@
2019-02-15 Youenn Fablet <you...@apple.com>
+ NetworkDataTask should check its client before calling shouldCaptureExtraNetworkLoadMetrics
+ https://bugs.webkit.org/show_bug.cgi?id=194732
+
+ Reviewed by Geoffrey Garen.
+
+ NetworkDataTask may be kept alive if refing it after its NetworkLoad is gone.
+ This might happen for instance in DownloadManager or when checking for TLS certificates.
+ In that case, if the NetworkLoad gets destroyed, it clears the client of the NetworkDataTask.
+ To ensure that NetworkDataTask does not try to use its client, add a null check.
+
+ * NetworkProcess/NetworkDataTask.cpp:
+ (WebKit::NetworkDataTask::shouldCaptureExtraNetworkLoadMetrics const):
+
+2019-02-15 Youenn Fablet <you...@apple.com>
+
Make ServiceWorkerClientFetch closer to WebResourceLoader
https://bugs.webkit.org/show_bug.cgi?id=194651
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/NetworkDataTask.cpp (241707 => 241708)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2019-02-18 16:16:24 UTC (rev 241707)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2019-02-18 16:16:28 UTC (rev 241708)
@@ -114,7 +114,7 @@
bool NetworkDataTask::shouldCaptureExtraNetworkLoadMetrics() const
{
- return m_client->shouldCaptureExtraNetworkLoadMetrics();
+ return m_client ? m_client->shouldCaptureExtraNetworkLoadMetrics() : false;
}
void NetworkDataTask::failureTimerFired()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
