diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-03-30 18:23:04 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-05-30 17:51:10 +0900 |
| commit | e156c0ccb530897d3a428255bd5585f7ea7b9b41 (patch) | |
| tree | bd4cd3e84666e0690dff4416a0fb8394bd0e33e1 | |
| parent | 5ff75da317539e87cca429185d710d0eeb9d9222 (diff) | |
os: Use strtok instead of xstrtokenize in ComputeLocalClient
Fixes leaking the memory pointed to by the members of the array returned
by xstrtokenize.
Reviewed-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | os/access.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/os/access.c b/os/access.c index 58f95a971..8828e0834 100644 --- a/os/access.c +++ b/os/access.c @@ -1131,19 +1131,20 @@ ComputeLocalClient(ClientPtr client) * is forwarded from another host via SSH */ if (cmdname) { - char **cmd; + char *cmd = strdup(cmdname); Bool ret; /* Cut off any colon and whatever comes after it, see * https://lists.freedesktop.org/archives/xorg-devel/2015-December/048164.html */ - cmd = xstrtokenize(cmdname, ":"); + cmd = strtok(cmd, ":"); #if !defined(WIN32) || defined(__CYGWIN__) - cmd[0] = basename(cmd[0]); + ret = strcmp(basename(cmd), "ssh") != 0; +#else + ret = strcmp(cmd, "ssh") != 0; #endif - ret = strcmp(cmd[0], "ssh") != 0; free(cmd); return ret; |