From: Jamey Sharp <jamey@minilop.net>
Date: Mon, 6 Jul 2009 20:14:35 +0000 (-0700)
Subject: Fix precedence bug: wrong length for big-requests preceded by sync.
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e06955ed66cb499ada52b8add6709edd38d70054;p=free-sw%2Fxcb%2Flibxcb

Fix precedence bug: wrong length for big-requests preceded by sync.

Also replace excessively clever use of bitwise OR with equivalent
addition.

Reported-by: Geoffrey Li <geoffrey@seitopos.com>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
---

diff --git a/src/xcb_out.c b/src/xcb_out.c
index 4c6ab13..b3050fe 100644
--- a/src/xcb_out.c
+++ b/src/xcb_out.c
@@ -242,7 +242,7 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect
             vector[1].iov_base = (uint32_t *) vector[1].iov_base + 1;
             vector[1].iov_len -= sizeof(uint32_t);
         }
-        vector[0].iov_len = sizeof(uint32_t) * (prefix[0] ? 1 : 0 | prefix[2] ? 2 : 0);
+        vector[0].iov_len = sizeof(uint32_t) * ((prefix[0] ? 1 : 0) + (prefix[2] ? 2 : 0));
         vector[0].iov_base = prefix + !prefix[0];
     }