Title: [241765] branches/safari-608.1.5.1-branch/Source/WebKit
- Revision
- 241765
- Author
- [email protected]
- Date
- 2019-02-19 11:05:17 -0800 (Tue, 19 Feb 2019)
Log Message
Cherry-pick r241641. rdar://problem/47833813
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241641 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1.5.1-branch/Source/WebKit/ChangeLog (241764 => 241765)
--- branches/safari-608.1.5.1-branch/Source/WebKit/ChangeLog 2019-02-19 19:05:11 UTC (rev 241764)
+++ branches/safari-608.1.5.1-branch/Source/WebKit/ChangeLog 2019-02-19 19:05:17 UTC (rev 241765)
@@ -1,5 +1,40 @@
2019-02-19 Alan Coon <[email protected]>
+ Cherry-pick r241641. rdar://problem/47833813
+
+ 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241641 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-15 Youenn Fablet <[email protected]>
+
+ 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-19 Alan Coon <[email protected]>
+
Cherry-pick r241631. rdar://problem/48126255
[PSON] Disable WebContent process cache on devices with less than 3GB of RAM
Modified: branches/safari-608.1.5.1-branch/Source/WebKit/NetworkProcess/NetworkDataTask.cpp (241764 => 241765)
--- branches/safari-608.1.5.1-branch/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2019-02-19 19:05:11 UTC (rev 241764)
+++ branches/safari-608.1.5.1-branch/Source/WebKit/NetworkProcess/NetworkDataTask.cpp 2019-02-19 19:05:17 UTC (rev 241765)
@@ -116,7 +116,7 @@
bool NetworkDataTask::shouldCaptureExtraNetworkLoadMetrics() const
{
- return m_client->shouldCaptureExtraNetworkLoadMetrics();
+ return m_client ? m_client->shouldCaptureExtraNetworkLoadMetrics() : false;
}
void NetworkDataTask::failureTimerFired()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
