xserver: Branch 'server-1.5-branch'

Michel Daenzer daenzer at kemper.freedesktop.org
Wed Apr 9 06:35:01 PDT 2008


 Xext/xres.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 032732270851ec2a12fc36e421f7335a2bd6ec34
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Wed Apr 9 13:37:59 2008 +0200

    Fix off-by-one error in ProcXResQueryClients().
    
    Fixes memory corruption reported at
    http://bugs.freedesktop.org/show_bug.cgi?id=14004 .
    (cherry picked from commit 0d1746995d91b55e40f233f0c38b56bafe896d38)

diff --git a/Xext/xres.c b/Xext/xres.c
index 9bd70c6..f444c4e 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++) {


More information about the xorg-commit mailing list