Changeset 223995 in webkit

Timestamp:

Oct 25, 2017 4:39:09 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Delete temporally downloaded file when it cancelled
​https://bugs.webkit.org/show_bug.cgi?id=134393

Patch by Basuke Suzuki <Basuke Suzuki> on 2017-10-25
Reviewed by Alex Christensen.

• platform/network/curl/CurlRequest.cpp:

(WebCore::CurlRequest::didCancelTransfer):
(WebCore::CurlRequest::writeDataToDownloadFileIfEnabled):
(WebCore::CurlRequest::closeDownloadFile):
(WebCore::CurlRequest::cleanupDownloadFile):

• platform/network/curl/CurlRequest.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CurlRequest.cpp (modified) (3 diffs)
• platform/network/curl/CurlRequest.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
+
+        [Curl] Delete temporally downloaded file when it cancelled
+        https://bugs.webkit.org/show_bug.cgi?id=134393
+
+        Reviewed by Alex Christensen.
+
+        * platform/network/curl/CurlRequest.cpp:
+        (WebCore::CurlRequest::didCancelTransfer):
+        (WebCore::CurlRequest::writeDataToDownloadFileIfEnabled):
+        (WebCore::CurlRequest::closeDownloadFile):
+        (WebCore::CurlRequest::cleanupDownloadFile):
+        * platform/network/curl/CurlRequest.h:
+
 2017-10-25  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/network/curl/CurlRequest.cpp

@@ -378 +378 @@
 {
     finalizeTransfer();
+    cleanupDownloadFile();
 }
 
@@ -611 +612 @@
 void CurlRequest::writeDataToDownloadFileIfEnabled(const SharedBuffer& buffer)
 {
-    LockHolder locker(m_downloadMutex);
-
-    if (!m_isEnabledDownloadToFile)
-        return;
-
-    if (m_downloadFilePath.isEmpty())
-        m_downloadFilePath = openTemporaryFile("download", m_downloadFileHandle);
+    {
+        LockHolder locker(m_downloadMutex);
+
+        if (!m_isEnabledDownloadToFile)
+            return;
+
+        if (m_downloadFilePath.isEmpty())
+            m_downloadFilePath = openTemporaryFile("download", m_downloadFileHandle);
+    }
 
     if (m_downloadFileHandle != invalidPlatformFileHandle)
@@ -630 +633 @@
         return;
 
-    WebCore::closeFile(m_downloadFileHandle);
+    closeFile(m_downloadFileHandle);
     m_downloadFileHandle = invalidPlatformFileHandle;
 }
 
+void CurlRequest::cleanupDownloadFile()
+{
+    LockHolder locker(m_downloadMutex);
+
+    if (!m_downloadFilePath.isEmpty()) {
+        deleteFile(m_downloadFilePath);
+        m_downloadFilePath = String();
+    }
+}
+
 CURLcode CurlRequest::willSetupSslCtxCallback(CURL*, void* sslCtx, void* userData)
 {

trunk/Source/WebCore/platform/network/curl/CurlRequest.h

@@ -118 +118 @@
     void writeDataToDownloadFileIfEnabled(const SharedBuffer&);
     void closeDownloadFile();
+    void cleanupDownloadFile();
 
     // Callback functions for curl