xserver: Branch 'master'

[Eamon Walsh]

 Xi/xichangehierarchy.c |    1 +
 Xi/xiquerydevice.c     |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 30df49f54945e75f033a0eb6445c26d37eb33c5e
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Jun 18 23:15:47 2009 -0400

    Xi: fix 2 memory leaks.
    
    In ProcXIQueryDevice() and XISendDeviceHierarchyEvent().
    
    Signed-off-by: Eamon Walsh <ewalsh at tycho.nsa.gov>

diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c
index ef6c394..5401554 100644
--- a/Xi/xichangehierarchy.c
+++ b/Xi/xichangehierarchy.c
@@ -118,6 +118,7 @@ void XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
 
     dummyDev.id = XIAllDevices;
     SendEventToAllWindows(&dummyDev, (XI_HierarchyChangedMask >> 8), (xEvent*)ev, 1);
+    xfree(ev);
 }
 
 
diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c
index b316c86..6aa1685 100644
--- a/Xi/xiquerydevice.c
+++ b/Xi/xiquerydevice.c
@@ -153,6 +153,7 @@ ProcXIQueryDevice(ClientPtr client)
 
     WriteReplyToClient(client, sizeof(xXIQueryDeviceReply), &rep);
     WriteToClient(client, rep.length * 4, ptr);
+    xfree(ptr);
     return rc;
 }