diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-22 18:04:05 +0930 |
| commit | 8190ef87547b704848231bde10b1cdffc6442790 (patch) | |
| tree | 29cb6d5bdefcee879d103953a140373635726f17 /Xext/xres.c | |
| parent | 179a082c26f9e562492ee2e59e7f44f949f39f9c (diff) | |
| parent | 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
Diffstat (limited to 'Xext/xres.c')
| -rw-r--r-- | Xext/xres.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/xres.c b/Xext/xres.c index c6fcc3e5e..3c47012fd 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -64,7 +64,7 @@ ProcXResQueryClients (ClientPtr client) REQUEST_SIZE_MATCH(xXResQueryClientsReq); - current_clients = xalloc((currentMaxClients - 1) * sizeof(int)); + current_clients = xalloc(currentMaxClients * sizeof(int)); num_clients = 0; for(i = 0; i < currentMaxClients; i++) { |