[Xquartz-changes] xserver: Branch 'master'

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit 1d2b67c47fb71b462d4d8240bab37b15d62f6b74
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Apr 14 09:06:04 2010 -0700

    XQuartz: Fix possible NULL dereference in ListenOnOpenFD
    
    <rdar://problem/7862319>
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    Reviewed-by: Marc Majka <majka at apple.com>

diff --git a/os/connection.c b/os/connection.c
index 3ff93bb..61ba72a 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1253,10 +1253,11 @@ MakeClientGrabPervious(ClientPtr client)
 void ListenOnOpenFD(int fd, int noxauth) {
     char port[256];
     XtransConnInfo ciptr;
+    const char *display_env = getenv("DISPLAY");
 
-    if(!strncmp(getenv("DISPLAY"), "/tmp/launch", 11)) {
+    if(display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
         /* Make the path the launchd socket if our DISPLAY is set right */
-        strcpy(port, getenv("DISPLAY"));
+        strcpy(port, display_env);
     } else {
         /* Just some default so things don't break and die. */
         sprintf(port, ":%d", atoi(display));