[Gnash-commit] [SCM] Gnash branch, master, updated. c6116b3f7eb2d657141a55afa66d573fd1cda7af

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  c6116b3f7eb2d657141a55afa66d573fd1cda7af (commit)
      from  a6c21759cb673f8f45b3f19c3bdc65c536ff963a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=c6116b3f7eb2d657141a55afa66d573fd1cda7af


commit c6116b3f7eb2d657141a55afa66d573fd1cda7af
Author: Sandro Santilli <address@hidden>
Date:   Sun Oct 3 22:13:27 2010 +0200

    FD_ZERO should not be called between curl_multi_fset and select...

diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 4604bee..b1caf8a 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -607,10 +607,6 @@ CurlStreamFile::fillCache(std::streamsize size)
     }
 
     fd_set readfd, writefd, exceptfd;
-    FD_ZERO(&readfd);
-    FD_ZERO(&writefd);
-    FD_ZERO(&exceptfd);
-
     int maxfd;
     CURLMcode mcode;
     timeval tv;
@@ -642,6 +638,11 @@ CurlStreamFile::fillCache(std::streamsize size)
         //log_debug("cached: %d, size: %d", _cached, size);
 #endif
 
+        // Zero these out _before_ calling curl_multi_fdset!
+        FD_ZERO(&readfd);
+        FD_ZERO(&writefd);
+        FD_ZERO(&exceptfd);
+
         mcode = curl_multi_fdset(_mhandle, &readfd, &writefd, 
                 &exceptfd, &maxfd);
 
@@ -663,10 +664,6 @@ CurlStreamFile::fillCache(std::streamsize size)
             break;
         }
 
-        FD_ZERO(&readfd);
-        FD_ZERO(&writefd);
-        FD_ZERO(&exceptfd);
-
         tv.tv_sec = 0;
         tv.tv_usec = maxSleepUsec;
 

-----------------------------------------------------------------------

Summary of changes:
 libbase/curl_adapter.cpp |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Gnash