andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Fix a strcpy/strcmp typo

Browse Source 
(cherry picked from commit 701c24da3e)
This commit is contained in:
Jeremy Huddleston 2009-09-05 02:51:09 -07:00
parent be37f339a9
commit 1747120043
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/xquartz/mach-startup/bundle-main.c
View File

@ -327,7 +327,7 @@ kern_return_t do_start_x11_server(mach_port_t port, string_array_t argv,
char **_envp = alloca((envpCnt + 1) * sizeof(char *));
size_t i;
/* If we didn't get handed a launchd DISPLAY socket, we shoul
/* If we didn't get handed a launchd DISPLAY socket, we should
* unset DISPLAY or we can run into problems with pbproxy
*/
if(!launchd_socket_handed_off)
@ -484,14 +484,15 @@ static void setup_env() {
}
if(s && *s) {
temp = (char *)malloc(sizeof(char) * (strlen(pds) + 3));
size_t pds_len = strlen(pds);
temp = (char *)malloc(sizeof(char) * pds_len);
if(!temp) {
fprintf(stderr, "Memory allocation error creating space for socket name test.\n");
}
strcpy(temp, pds);
strcat(temp, ":0");
strlcpy(temp, pds, pds_len - 3);
strlcat(temp, ":0", pds_len);
if(strcpy(temp, s) != 0) {
if(strcmp(temp, s) != 0) {
/* If we don't have a match, unset it. */
unsetenv("DISPLAY");
}