X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_conn.c;h=698cf51f146c32ad52b444b4c7028dd1b581f1fa;hb=67b2649dc4b6726c6d11fb0e41429ae5de82b0e8;hp=d7a17ba97f14fb84539eda28c95000272c93aa1e;hpb=5b1d39e27b1a966df537ead248da5a57e7d9de97;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_conn.c b/src/xcb_conn.c
index d7a17ba..698cf51 100644
--- a/src/xcb_conn.c
+++ b/src/xcb_conn.c
@@ -38,8 +38,9 @@
 
 static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
 {
+    static const char pad[3];
     XCBConnSetupReq out;
-    struct iovec parts[3];
+    struct iovec parts[6];
     int count = 0;
     int endian = 0x01020304;
     int ret;
@@ -57,14 +58,21 @@ static int write_setup(XCBConnection *c, XCBAuthInfo *auth_info)
     out.authorization_protocol_data_len = 0;
     parts[count].iov_len = sizeof(XCBConnSetupReq);
     parts[count++].iov_base = &out;
+    parts[count].iov_len = XCB_PAD(sizeof(XCBConnSetupReq));
+    parts[count++].iov_base = (caddr_t) pad;
 
     if(auth_info)
     {
         parts[count].iov_len = out.authorization_protocol_name_len = auth_info->namelen;
         parts[count++].iov_base = auth_info->name;
+        parts[count].iov_len = XCB_PAD(out.authorization_protocol_name_len);
+        parts[count++].iov_base = (caddr_t) pad;
         parts[count].iov_len = out.authorization_protocol_data_len = auth_info->datalen;
         parts[count++].iov_base = auth_info->data;
+        parts[count].iov_len = XCB_PAD(out.authorization_protocol_data_len);
+        parts[count++].iov_base = (caddr_t) pad;
     }
+    assert(count <= sizeof(parts) / sizeof(*parts));
 
     pthread_mutex_lock(&c->iolock);
     _xcb_out_write_block(c, parts, count);
@@ -80,7 +88,7 @@ static int read_setup(XCBConnection *c)
     if(!c->setup)
         return 0;
 
-    if(_xcb_read_block(c->fd, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
+    if(_xcb_in_read_block(c, c->setup, sizeof(XCBConnSetupGenericRep)) != sizeof(XCBConnSetupGenericRep))
         return 0;
 
     {
@@ -90,7 +98,7 @@ static int read_setup(XCBConnection *c)
         c->setup = tmp;
     }
 
-    if(_xcb_read_block(c->fd, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
+    if(_xcb_in_read_block(c, (char *) c->setup + sizeof(XCBConnSetupGenericRep), c->setup->length * 4) <= 0)
         return 0;
 
     /* 0 = failed, 2 = authenticate, 1 = success */
@@ -181,8 +189,6 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
     int ret;
     fd_set rfds, wfds;
 
-    _xcb_assert_valid_sequence(c);
-
     /* If the thing I should be doing is already being done, wait for it. */
     if(should_write ? c->out.writing : c->in.reading)
     {
@@ -208,10 +214,10 @@ int _xcb_conn_wait(XCBConnection *c, const int should_write, pthread_cond_t *con
     if(ret)
     {
         if(FD_ISSET(c->fd, &rfds))
-            ret = ret && _xcb_in_read(c) > 0;
+            ret = ret && _xcb_in_read(c);
 
         if(FD_ISSET(c->fd, &wfds))
-            ret = ret && _xcb_out_write(c) > 0;
+            ret = ret && _xcb_out_write(c);
     }
 
     if(should_write)