From 6fb661f3ff2fca342b4ea76d5a583c5e4f53e076 Mon Sep 17 00:00:00 2001 From: Ian Osgood Date: Wed, 8 Mar 2006 21:56:57 -0800 Subject: [PATCH 1/4] Bugfix: null-terminate the path in sockaddr_un before using it. This may fix itermittant connect failures. --- src/xcb_auth.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/xcb_auth.c b/src/xcb_auth.c index 9f2cb5a..fb1d0d3 100644 --- a/src/xcb_auth.c +++ b/src/xcb_auth.c @@ -168,7 +168,9 @@ static Xauth *get_authptr(struct sockaddr *sockname, unsigned int socknamelen) case AF_UNIX: /*block*/ { struct sockaddr_un *su = (struct sockaddr_un *) sockname; + char *sockbuf = (char *) sockname; assert(sizeof(*su) >= socknamelen); + sockbuf[socknamelen] = 0; /* null-terminate path */ display = strrchr(su->sun_path, 'X'); if (display == 0) return 0; /* sockname is mangled somehow */ From 1261a4150c8bd39a6fb6887df52abbbb446f7ffb Mon Sep 17 00:00:00 2001 From: Ian Osgood Date: Wed, 8 Mar 2006 22:26:20 -0800 Subject: [PATCH 2/4] Add symbols for error and reply response_types, and use XCBKeymapNotify from xcb-proto. --- src/xcb_in.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/xcb_in.c b/src/xcb_in.c index ea851c7..4661bc4 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -36,6 +36,9 @@ #include "xcbext.h" #include "xcbint.h" +#define XCBError 0 +#define XCBReply 1 + struct event_list { XCBGenericEvent *event; struct event_list *next; @@ -85,7 +88,7 @@ static int read_packet(XCBConnection *c) memcpy(&genrep, c->in.queue, sizeof(genrep)); /* Compute 32-bit sequence number of this packet. */ - if((genrep.response_type & 0x7f) != KeymapNotify) + if((genrep.response_type & 0x7f) != XCBKeymapNotify) { int lastread = c->in.request_read; c->in.request_read = (lastread & 0xffff0000) | genrep.sequence; @@ -104,7 +107,7 @@ static int read_packet(XCBConnection *c) } c->in.request_completed = c->in.request_read - 1; } - if(genrep.response_type != 1) /* not reply: error or event */ + if(genrep.response_type != XCBReply) /* error or event */ c->in.request_completed = c->in.request_read; /* XXX: does event/error imply no more replies? */ while(c->in.pending_replies && c->in.pending_replies->request <= c->in.request_completed) @@ -117,7 +120,7 @@ static int read_packet(XCBConnection *c) } } - if(genrep.response_type == 0 || genrep.response_type == 1) + if(genrep.response_type == XCBError || genrep.response_type == XCBReply) { pend = c->in.pending_replies; if(pend && pend->request != c->in.request_read) @@ -125,7 +128,7 @@ static int read_packet(XCBConnection *c) } /* For reply packets, check that the entire packet is available. */ - if(genrep.response_type == 1) + if(genrep.response_type == XCBReply) { if(pend && pend->workaround == WORKAROUND_GLX_GET_FB_CONFIGS_BUG) { @@ -135,7 +138,7 @@ static int read_packet(XCBConnection *c) length += genrep.length * 4; } - buf = malloc(length + (genrep.response_type == 1 ? 0 : sizeof(CARD32))); + buf = malloc(length + (genrep.response_type == XCBReply ? 0 : sizeof(CARD32))); if(!buf) return 0; if(_xcb_in_read_block(c, buf, length) <= 0) @@ -149,11 +152,12 @@ static int read_packet(XCBConnection *c) return 1; } - if(genrep.response_type != 1) + if(genrep.response_type != XCBReply) ((XCBGenericEvent *) buf)->full_sequence = c->in.request_read; /* reply, or checked error */ - if(genrep.response_type == 1 || (genrep.response_type == 0 && pend && (pend->flags & XCB_REQUEST_CHECKED))) + if( genrep.response_type == XCBReply || + (genrep.response_type == XCBError && pend && (pend->flags & XCB_REQUEST_CHECKED))) { reader_list *reader; struct reply_list *cur = malloc(sizeof(struct reply_list)); @@ -294,7 +298,7 @@ void *XCBWaitForReply(XCBConnection *c, unsigned int request, XCBGenericError ** ret = head->reply; free(head); - if(((XCBGenericRep *) ret)->response_type == 0) /* X error */ + if(((XCBGenericRep *) ret)->response_type == XCBError) { if(e) *e = ret; From fd1f9cb13f9ab9a6bb6aa0c894d4891809bece8a Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Wed, 8 Mar 2006 22:49:59 -0800 Subject: [PATCH 3/4] Unify autofoo .gitignore bits into one top-level file, and remove resulting redundancies. --- .gitignore | 19 ------------------- src/.gitignore | 12 ------------ tests/.gitignore | 4 ---- 3 files changed, 35 deletions(-) diff --git a/.gitignore b/.gitignore index ed62141..0e6c05b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1 @@ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -compile -config.guess -config.log -config.status -config.sub -configure configure.lineno -depcomp -install-sh -libtool -ltmain.sh -missing -mkinstalldirs -*.pc -*.tar.bz2 -*.tar.gz diff --git a/src/.gitignore b/src/.gitignore index f3e1232..1b0d39b 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,14 +1,3 @@ -.deps -.libs -Makefile -Makefile.in -config.h -config.h.in -stamp-h1 -*.lo -*.loT -*.la -*.o xproto.c xproto.h xcb_des.c @@ -16,4 +5,3 @@ xcb_types.c xcb_types.h extensions X11 -check_all diff --git a/tests/.gitignore b/tests/.gitignore index a633f9c..9d27cc5 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,7 +1,3 @@ -.libs -.deps -*.o -Makefile.in CheckLog.html CheckLog_xcb.xml check_all From 5cdc02e3441dc623e91ebc5d7f735565b83f8435 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Sat, 11 Mar 2006 20:32:04 -0800 Subject: [PATCH 4/4] Portability fixes. Should help DragonFly and Solaris, and should not hurt anything else. Tested only on linux so far though. --- src/c-client.xsl | 4 ++-- src/xcb.h | 1 + src/xcb_conn.c | 6 +++--- src/xcb_out.c | 2 +- src/xcb_util.c | 1 + 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/c-client.xsl b/src/c-client.xsl index c35fe33..054d84a 100644 --- a/src/c-client.xsl +++ b/src/c-client.xsl @@ -596,13 +596,13 @@ authorization from the authors. mode="assign" /> - xcb_parts[2].iov_base = &xcb_out; + xcb_parts[2].iov_base = (char *) &xcb_out; xcb_parts[2].iov_len = sizeof(xcb_out); xcb_parts[3].iov_base = 0; xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; - xcb_parts[].iov_base = (void *) ; xcb_parts[].iov_len =