projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix off-by-one error that kept the last byte(s) of the output queue from being used.
[free-sw/xcb/libxcb]
/
src
/
xcb_out.c
diff --git
a/src/xcb_out.c
b/src/xcb_out.c
index
c4ef737
..
1faf2a5
100644
(file)
--- a/
src/xcb_out.c
+++ b/
src/xcb_out.c
@@
-136,7
+136,7
@@
unsigned int XCBSendRequest(XCBConnection *c, int flags, struct iovec *vector, c
while(c->out.writing)
pthread_cond_wait(&c->out.cond, &c->iolock);
while(c->out.writing)
pthread_cond_wait(&c->out.cond, &c->iolock);
- if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) -
1
)
+ if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) -
2
)
{
prefix[0] = sync.packet;
request = ++c->out.request;
{
prefix[0] = sync.packet;
request = ++c->out.request;
@@
-237,7
+237,7
@@
int _xcb_out_write(XCBConnection *c)
int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
{
assert(!c->out.vec && !c->out.vec_len);
int _xcb_out_write_block(XCBConnection *c, struct iovec *vector, size_t count)
{
assert(!c->out.vec && !c->out.vec_len);
- while(count && c->out.queue_len + vector[0].iov_len < sizeof(c->out.queue))
+ while(count && c->out.queue_len + vector[0].iov_len <
=
sizeof(c->out.queue))
{
memcpy(c->out.queue + c->out.queue_len, vector[0].iov_base, vector[0].iov_len);
c->out.queue_len += vector[0].iov_len;
{
memcpy(c->out.queue + c->out.queue_len, vector[0].iov_base, vector[0].iov_len);
c->out.queue_len += vector[0].iov_len;