Changeset 152297 in webkit

Timestamp:

Jul 2, 2013 9:26:03 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Crash after download.
​https://bugs.webkit.org/show_bug.cgi?id=118303

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2013-07-02
Reviewed by Brent Fulgham.

We need to make sure that the Curl easy handle is removed from the Curl multi handle before it's freed.

• platform/network/curl/CurlDownload.cpp:

(CurlDownloadManager::updateHandleList): Use addToCurl() and removeFromCurl() methods.
(CurlDownloadManager::addToCurl): Add method to add easy handle to multi handle.
(CurlDownloadManager::removeFromCurl): Add method to remove easy handle from multi handle, and then delete the handle.
(CurlDownloadManager::downloadThread): Use removeFromCurl() method.
(CurlDownload::~CurlDownload):

• platform/network/curl/CurlDownload.h: Avoid deleting Curl easy handle in destructor.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CurlDownload.cpp (modified) (4 diffs)
• platform/network/curl/CurlDownload.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  peavo@outlook.com  <peavo@outlook.com>
+
+        [Curl] Crash after download.
+        https://bugs.webkit.org/show_bug.cgi?id=118303
+
+        Reviewed by Brent Fulgham.
+
+        We need to make sure that the Curl easy handle is removed from the Curl multi handle before it's freed.
+
+        * platform/network/curl/CurlDownload.cpp:
+        (CurlDownloadManager::updateHandleList): Use addToCurl() and removeFromCurl() methods.
+        (CurlDownloadManager::addToCurl): Add method to add easy handle to multi handle.
+        (CurlDownloadManager::removeFromCurl): Add method to remove easy handle from multi handle, and then delete the handle.
+        (CurlDownloadManager::downloadThread): Use removeFromCurl() method.
+        (CurlDownload::~CurlDownload):
+        * platform/network/curl/CurlDownload.h: Avoid deleting Curl easy handle in destructor.
+
 2013-07-02  Radu Stavila  <stavila@adobe.com>
 

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

@@ -122 +122 @@
     int size = m_pendingHandleList.size();
     for (int i = 0; i < size; i++) {
-        CURLMcode retval = curl_multi_add_handle(m_curlMultiHandle, m_pendingHandleList[0]);
-
-        if (retval == CURLM_OK)
+        if (addToCurl(m_pendingHandleList[0]))
             m_pendingHandleList.remove(0);
     }
@@ -131 +129 @@
     size = m_removedHandleList.size();
     for (int i = 0; i < size; i++) {
-        CURLMcode retval = curl_multi_remove_handle(m_curlMultiHandle, m_removedHandleList[0]);
-
-        if (retval == CURLM_OK)
+        if (removeFromCurl(m_removedHandleList[0]))
             m_removedHandleList.remove(0);
     }
+}
+
+bool CurlDownloadManager::addToCurl(CURL* curlHandle)
+{
+    CURLMcode retval = curl_multi_add_handle(m_curlMultiHandle, curlHandle);
+    return retval == CURLM_OK;
+}
+
+bool CurlDownloadManager::removeFromCurl(CURL* curlHandle)
+{
+    CURLMcode retval = curl_multi_remove_handle(m_curlMultiHandle, curlHandle);
+    if (retval == CURLM_OK) {
+        curl_easy_cleanup(curlHandle);
+        return true;
+    }
+    return false;
 }
 
@@ -189 +201 @@
                 callOnMainThread<CurlDownload*, CurlDownload*>(CurlDownload::downloadFailedCallback, download);
 
-            curl_multi_remove_handle(downloadManager->getMultiHandle(), msg->easy_handle);
+            downloadManager->removeFromCurl(msg->easy_handle);
         }
 
@@ -212 +224 @@
 {
     MutexLocker locker(m_mutex);
-
-    if (m_curlHandle)
-        curl_easy_cleanup(m_curlHandle);
 
     if (m_url)

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

@@ -59 +59 @@
     bool runThread() const { return m_runThread; }
     void setRunThread(bool runThread) { m_runThread = runThread; }
+
+    bool addToCurl(CURL* curlHandle);
+    bool removeFromCurl(CURL* curlHandle);
 
     static void downloadThread(void* data);