Changeset 5196 for pjproject/trunk/pjlib/src/pj/ioqueue_select.c

Timestamp:

Nov 6, 2015 11:36:06 AM (9 years ago)

Author:

nanang

Message:

Re #1894: Fixed high socket descriptor check in ioqueue select, it should be against FD_SETSIZE instead of PJ_IOQUEUE_MAX_HANDLES, as PJ_IOQUEUE_MAX_HANDLES can be lower than FD_SETSIZE.

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_select.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/ioqueue_select.c

@@ -339 +339 @@
      * an fd that is higher than FD_SETSIZE.
      */
-    if (sizeof(fd_set) < FD_SETSIZE && sock >= PJ_IOQUEUE_MAX_HANDLES)
-        return PJ_ETOOBIG;
+    if (sizeof(fd_set) < FD_SETSIZE && sock >= FD_SETSIZE) {
+        PJ_LOG(4, ("pjlib", "Failed to register socket to ioqueue because "
+                            "socket fd is too big (fd=%d/FD_SETSIZE=%d)",
+                            sock, FD_SETSIZE));
+        return PJ_ETOOBIG;
+    }
 
     pj_lock_acquire(ioqueue->lock);