frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Fix possible NULL dereference in ListenOnOpenFD 

<rdar://problem/7862319>

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Marc Majka <majka@apple.com>
This commit is contained in:
Jeremy Huddleston 2010-04-14 09:06:04 -07:00
parent 206531f75c
commit fe7778e58e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/connection.c
View File

@ -1253,10 +1253,11 @@ MakeClientGrabPervious(ClientPtr client)
void ListenOnOpenFD(int fd, int noxauth) { void ListenOnOpenFD(int fd, int noxauth) {
char port[256]; char port[256];
XtransConnInfo ciptr; 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 */ /* Make the path the launchd socket if our DISPLAY is set right */
strcpy(port, getenv("DISPLAY")); strcpy(port, display_env);
} else { } else {
/* Just some default so things don't break and die. */ /* Just some default so things don't break and die. */
sprintf(port, ":%d", atoi(display)); sprintf(port, ":%d", atoi(display));