Title: [154006] trunk/Source/WebCore
Revision
154006
Author
[email protected]
Date
2013-08-13 09:19:31 -0700 (Tue, 13 Aug 2013)

Log Message

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

Patch by [email protected] <[email protected]> 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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (154005 => 154006)


--- trunk/Source/WebCore/ChangeLog	2013-08-13 16:18:43 UTC (rev 154005)
+++ trunk/Source/WebCore/ChangeLog	2013-08-13 16:19:31 UTC (rev 154006)
@@ -1,3 +1,16 @@
+2013-08-13  [email protected]  <[email protected]>
+
+        [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  <[email protected]>
 
         HTMLSelectElement.item() does not behave according to specification

Modified: trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp (154005 => 154006)


--- trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp	2013-08-13 16:18:43 UTC (rev 154005)
+++ trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp	2013-08-13 16:19:31 UTC (rev 154006)
@@ -123,15 +123,15 @@
     // Remove curl easy handles from multi list 
     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);
     }
 
     // Add pending curl easy handles to multi list 
     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);
     }
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to