diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-05 08:13:07 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-05 08:13:07 +0000 |
| commit | 3ced31dfa7da11653ae880c2776cbf2e2256a009 (patch) | |
| tree | 981ca5d9ba5a6d1f1cf8b8685faf120dd8c5c96c /xserver/os | |
| parent | 939fde46a015afeec2b96b5cb6d0cc8aefe54c3d (diff) | |
Update to xserver 21.1.14. tested by tb@
The xkb security fix was committed earlier. This is the rest of the
21.1.14 update.
Diffstat (limited to 'xserver/os')
| -rw-r--r-- | xserver/os/client.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xserver/os/client.c b/xserver/os/client.c index 2ed69ea4c..36de908c4 100644 --- a/xserver/os/client.c +++ b/xserver/os/client.c @@ -136,7 +136,7 @@ DetermineClientPid(struct _Client * client) void DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs) { -#if !defined(__APPLE__) +#if !defined(__APPLE__) && !defined(__OpenBSD__) char path[PATH_MAX + 1]; int totsize = 0; int fd = 0; @@ -269,10 +269,9 @@ DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs) return; argv = kvm_getargv(kd, kp, 0); if (cmdname) { - if (argv == NULL || argv[0] == NULL) { - *cmdname = strdup(""); + if (argv == NULL || argv[0] == NULL) return; - } else + else *cmdname = strdup(argv[0]); } if (cmdargs) { |