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

Don't crash if the client argv or argv[0] is NULL. 

Report from  bauerm at pestilenz dot org.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/995>
This commit is contained in:
Matthieu Herrb 2022-11-11 14:58:02 +01:00 committed by Marge Bot
parent 96079f8c68
commit a8512146ba
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/client.c
View File

@ -325,7 +325,14 @@ DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
if (n != 1) if (n != 1)
return; return;
argv = kvm_getargv(kd, kp, 0); argv = kvm_getargv(kd, kp, 0);
if (cmdname) {
if (argv == NULL || argv[0] == NULL) {
*cmdname = strdup("");
return;
} else
*cmdname = strdup(argv[0]); *cmdname = strdup(argv[0]);
}
if (cmdargs) {
i = 1; i = 1;
while (argv[i] != NULL) { while (argv[i] != NULL) {
len += strlen(argv[i]) + 1; len += strlen(argv[i]) + 1;
@ -334,10 +341,11 @@ DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
*cmdargs = calloc(1, len); *cmdargs = calloc(1, len);
i = 1; i = 1;
while (argv[i] != NULL) { while (argv[i] != NULL) {
strlcat(*cmdargs, argv[i], len); strlcat(*(char **)cmdargs, argv[i], len);
strlcat(*cmdargs, " ", len); strlcat(*(char **)cmdargs, " ", len);
i++; i++;
} }
}
kvm_close(kd); kvm_close(kd);
} }
#else /* Linux using /proc/pid/cmdline */ #else /* Linux using /proc/pid/cmdline */