aboutsummaryrefslogtreecommitdiff
path: root/libxcb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-12-13 21:47:02 +0000
committermarha <marha@users.sourceforge.net>2010-12-13 21:47:02 +0000
commitc59dda05406935ac1aaf11bf8cbd1b3140d8d115 (patch)
tree310ccef5b08b80a9f66ade13106df783cc91ea7f /libxcb
parentcf3e1aff1536734f75a1cf1c56d91a6017344e03 (diff)
parentfa61692edfc99e13bd2f0bc761590bfeefcfc07a (diff)
downloadvcxsrv-c59dda05406935ac1aaf11bf8cbd1b3140d8d115.tar.gz
vcxsrv-c59dda05406935ac1aaf11bf8cbd1b3140d8d115.tar.bz2
vcxsrv-c59dda05406935ac1aaf11bf8cbd1b3140d8d115.zip
svn merge ^/branches/released .
Diffstat (limited to 'libxcb')
-rw-r--r--libxcb/src/xcb_conn.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c
index 3a8eafa76..5593201d5 100644
--- a/libxcb/src/xcb_conn.c
+++ b/libxcb/src/xcb_conn.c
@@ -278,6 +278,16 @@ xcb_connection_t *xcb_connect_to_fd(int fd, xcb_auth_info_t *auth_info)
{
xcb_connection_t* c;
+#ifndef _WIN32
+#ifndef USE_POLL
+ if(fd >= FD_SETSIZE) /* would overflow in FD_SET */
+ {
+ close(fd);
+ return (xcb_connection_t *) &error_connection;
+ }
+#endif
+#endif /* !_WIN32*/
+
c = calloc(1, sizeof(xcb_connection_t));
if(!c) {
close(fd);