[Pkg-telepathy-commits] [SCM] libjingle0.3 packaging branch, debian-lenny-patches, updated. 9ebee35c7f7cff456c26f6b0fa98f93f4e9d0afc

[Simon McVittie]

The following commit has been merged in the debian-lenny-patches branch:
commit 4e0b5f0981fa98cb3048904e91a83dcaf2b36cce
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 22:37:55 2008 +0000

    01_ignore_invalid_sockets.path, to avoid crashing when an invalid socket is dispatched

diff --git a/talk/base/physicalsocketserver.cc b/talk/base/physicalsocketserver.cc
index a16f05f..2372b35 100644
--- a/talk/base/physicalsocketserver.cc
+++ b/talk/base/physicalsocketserver.cc
@@ -876,6 +876,8 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) {
         if (!process_io && (pdispatcher != signal_wakeup_))
           continue;
         int fd = pdispatcher->GetDescriptor();
+        if (fd == INVALID_SOCKET)
+          continue;
         if (fd > fdmax)
           fdmax = fd;
         uint32 ff = pdispatcher->GetRequestedEvents();
@@ -910,6 +912,8 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) {
       for (unsigned i = 0; i < dispatchers_.size(); i++) {
         Dispatcher *pdispatcher = dispatchers_[i];
         int fd = pdispatcher->GetDescriptor();
+        if (fd == INVALID_SOCKET)
+          continue;
         uint32 ff = 0;
         if (FD_ISSET(fd, &fdsRead)) {
           FD_CLR(fd, &fdsRead);

-- 
libjingle0.3 packaging