Changeset 246588 in webkit

Timestamp:

Jun 19, 2019, 8:11:30 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] CurlRequestScheduler doesn't terminate worker thread in a certain situation.
​https://bugs.webkit.org/show_bug.cgi?id=198993

Cancel CurlRequest before invalidation to remove tasks from CurlRequestScheduler certainly in ~NetworkDataTaskCurl.

Patch by Takashi Komori <​Takashi.Komori@sony.com> on 2019-06-19
Reviewed by Fujii Hironori.

• NetworkProcess/curl/NetworkDataTaskCurl.cpp:

(WebKit::NetworkDataTaskCurl::~NetworkDataTaskCurl):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/curl/NetworkDataTaskCurl.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-19  Takashi Komori  <Takashi.Komori@sony.com>
+
+        [Curl] CurlRequestScheduler doesn't terminate worker thread in a certain situation.
+        https://bugs.webkit.org/show_bug.cgi?id=198993
+
+        Cancel CurlRequest before invalidation to remove tasks from CurlRequestScheduler certainly in ~NetworkDataTaskCurl.
+
+        Reviewed by Fujii Hironori.
+
+        * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
+        (WebKit::NetworkDataTaskCurl::~NetworkDataTaskCurl):
+
 2019-06-19  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp

@@ -77 +77 @@
 NetworkDataTaskCurl::~NetworkDataTaskCurl()
 {
-    if (m_curlRequest)
-        m_curlRequest->invalidateClient();
+    invalidateAndCancel();
 }