Changeset 154006 in webkit

Timestamp:

Aug 13, 2013 9:19:31 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Possible infinite loop while downloading.
​https://bugs.webkit.org/show_bug.cgi?id=119744

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2013-08-13
Reviewed by Darin Adler.

If adding/removing curl handles fails, the download thread
can end up in an endless loop trying to update the curl handle list.

• platform/network/curl/CurlDownload.cpp:

(WebCore::CurlDownloadManager::updateHandleList): Avoid infinite loop by ignoring return value.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-13  peavo@outlook.com  <peavo@outlook.com>
+
+        [Curl] Possible infinite loop while downloading.
+        https://bugs.webkit.org/show_bug.cgi?id=119744
+
+        Reviewed by Darin Adler.
+
+        If adding/removing curl handles fails, the download thread
+        can end up in an endless loop trying to update the curl handle list.
+
+        * platform/network/curl/CurlDownload.cpp:
+        (WebCore::CurlDownloadManager::updateHandleList): Avoid infinite loop by ignoring return value.
+
 2013-08-13  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

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

@@ -124 +124 @@
     int size = m_removedHandleList.size();
     for (int i = 0; i < size; i++) {
-        if (removeFromCurl(m_removedHandleList[0]))
-            m_removedHandleList.remove(0);
+        removeFromCurl(m_removedHandleList[0]);
+        m_removedHandleList.remove(0);
     }
 
@@ -131 +131 @@
     size = m_pendingHandleList.size();
     for (int i = 0; i < size; i++) {
-        if (addToCurl(m_pendingHandleList[0]))
-            m_pendingHandleList.remove(0);
+        addToCurl(m_pendingHandleList[0]);
+        m_pendingHandleList.remove(0);
     }
 }