xserver: Branch 'master'

[Keith Packard]

 test/xi2/protocol-common.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d9bda34d0df576d155e1d682d5e2a382b8e1ffda
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jun 1 10:24:43 2011 +1000

    test: fix memset size for WindowRec (#37801)
    
    X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Reviewed-by: Cyril Brulebois <kibi at debian.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 6ffc697..4234533 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -121,7 +121,7 @@ ClientRec init_client(int len, void *data)
 
 void init_window(WindowPtr window, WindowPtr parent, int id)
 {
-    memset(window, 0, sizeof(window));
+    memset(window, 0, sizeof(*window));
 
     window->drawable.id = id;
     if (parent)