xserver: Branch 'master' - 2 commits

[Alan Coopersmith]

 os/xdmcp.c |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
diff-tree ff6b59a0dbadbe61a53e48c23965d3073d95791b (from parents)
Merge: b3c869304cd85af034aa9debaa874e29d14fcbe6 48c871564d493203d434d5da015903399287f619
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Jun 26 13:02:33 2006 -0700

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

diff-tree b3c869304cd85af034aa9debaa874e29d14fcbe6 (from 91dcac5295486cc55a34ad91704bfa483bd31eeb)
Author: Peter Breitenlohner <peb at mppmu.mpg.de>
Date:   Mon Jun 26 10:48:44 2006 -0700

    Free small, one-time memory leak in xdmcp -from handling
    
    Part of Patch #6046 <https://bugs.freedesktop.org/attachment.cgi?id=6046>

diff --git a/os/xdmcp.c b/os/xdmcp.c
index 3aad4ee..4f87097 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -1603,6 +1603,10 @@ get_fromaddr_by_name(
       , &ai, &aifirst
 #endif
 	);
+#if defined(IPv6) && defined(AF_INET6)
+    if (aifirst != NULL)
+	freeaddrinfo(aifirst);
+#endif
     xdm_from = argv[i];
 }