diff options
author | marha <marha@users.sourceforge.net> | 2012-09-20 08:18:11 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-20 08:18:11 +0200 |
commit | 06d4ea68085558b94d8e9c937091e7b7fcc5d95a (patch) | |
tree | 01ff2f6a8d6ae430a526282d98eede21c7cfffd0 /libxcb/src | |
parent | 52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff) | |
download | vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.gz vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.tar.bz2 vcxsrv-06d4ea68085558b94d8e9c937091e7b7fcc5d95a.zip |
libxcb xserver pixman mesa git update 20 sep 2012
libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea
xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345
pixman: 3124a51abb89475b8c5045bc96e04c5852694a16
mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
Diffstat (limited to 'libxcb/src')
-rw-r--r-- | libxcb/src/xcb_conn.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libxcb/src/xcb_conn.c b/libxcb/src/xcb_conn.c index 7979491d3..e01d56682 100644 --- a/libxcb/src/xcb_conn.c +++ b/libxcb/src/xcb_conn.c @@ -36,6 +36,7 @@ #include <stdlib.h> #include <fcntl.h> #include <errno.h> +#include <limits.h> #include "xcb.h" #include "xcbint.h" @@ -209,7 +210,11 @@ static int write_vec(xcb_connection_t *c, struct iovec **vector, int *count) i++; } #else - n = writev(c->fd, *vector, *count); + n = *count; + if (n > IOV_MAX) + n = IOV_MAX; + + n = writev(c->fd, *vector, n); if(n < 0 && errno == EAGAIN) return 1; #endif /* _WIN32 */ |