XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3e
)
This commit is contained in:
parent
be37f339a9
commit
1747120043
|
@ -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 *));
|
char **_envp = alloca((envpCnt + 1) * sizeof(char *));
|
||||||
size_t i;
|
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
|
* unset DISPLAY or we can run into problems with pbproxy
|
||||||
*/
|
*/
|
||||||
if(!launchd_socket_handed_off)
|
if(!launchd_socket_handed_off)
|
||||||
|
@ -484,14 +484,15 @@ static void setup_env() {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(s && *s) {
|
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) {
|
if(!temp) {
|
||||||
fprintf(stderr, "Memory allocation error creating space for socket name test.\n");
|
fprintf(stderr, "Memory allocation error creating space for socket name test.\n");
|
||||||
}
|
}
|
||||||
strcpy(temp, pds);
|
strlcpy(temp, pds, pds_len - 3);
|
||||||
strcat(temp, ":0");
|
strlcat(temp, ":0", pds_len);
|
||||||
|
|
||||||
if(strcpy(temp, s) != 0) {
|
if(strcmp(temp, s) != 0) {
|
||||||
/* If we don't have a match, unset it. */
|
/* If we don't have a match, unset it. */
|
||||||
unsetenv("DISPLAY");
|
unsetenv("DISPLAY");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user