diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
| commit | 4a991716ac65d28a68f9943d54c4b74ad0b58f65 (patch) | |
| tree | c037c3fe64bb15ea67dbf03a96783a8b04085371 /xserver/Xi/xiquerypointer.c | |
| parent | 549cb8bcb6bdd3a7d44f3b9fdc003df777b2b0d2 (diff) | |
Update to xserver 1.18.3. Tested by shadchin@ and naddy@.
Note that indirect GLX is now disbled by default.
Diffstat (limited to 'xserver/Xi/xiquerypointer.c')
| -rw-r--r-- | xserver/Xi/xiquerypointer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xserver/Xi/xiquerypointer.c b/xserver/Xi/xiquerypointer.c index 7ec0c851d..b9e295815 100644 --- a/xserver/Xi/xiquerypointer.c +++ b/xserver/Xi/xiquerypointer.c @@ -152,10 +152,10 @@ ProcXIQueryPointer(ClientPtr client) rep.buttons_len = bytes_to_int32(bits_to_bytes(pDev->button->numButtons)); rep.length += rep.buttons_len; - buttons_size = rep.buttons_len * 4; - buttons = calloc(1, buttons_size); + buttons = calloc(rep.buttons_len, 4); if (!buttons) return BadAlloc; + buttons_size = rep.buttons_len * 4; for (i = 1; i < pDev->button->numButtons; i++) if (BitIsOn(pDev->button->down, i)) |