--- base/process/process_handle_openbsd.cc.orig 2022-02-07 13:39:41 UTC +++ base/process/process_handle_openbsd.cc @@ -3,8 +3,11 @@ // found in the LICENSE file. #include "base/process/process_handle.h" +#include "base/files/file_util.h" #include +#include +#include #include #include #include @@ -14,39 +17,59 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { - struct kinfo_proc info; + struct kinfo_proc *info; size_t length; + pid_t ppid; int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(length); + mib[5] = (length / sizeof(struct kinfo_proc)); - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) - return -1; + if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) { + ppid = -1; + goto out; + } - return info.p_ppid; + ppid = info->p_ppid; + +out: + free(info); + return ppid; } FilePath GetProcessExecutablePath(ProcessHandle process) { - struct kinfo_proc kp; - size_t len; + struct kinfo_proc *info; + size_t length; + char *path = NULL; int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; - if (sysctl(mib, base::size(mib), NULL, &len, NULL, 0) == -1) + if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) == -1) return FilePath(); - mib[5] = (len / sizeof(struct kinfo_proc)); - if (sysctl(mib, base::size(mib), &kp, &len, NULL, 0) < 0) - return FilePath(); - if ((kp.p_flag & P_SYSTEM) != 0) - return FilePath(); - if (strcmp(kp.p_comm, "chrome") == 0) - return FilePath(kp.p_comm); - return FilePath(); + info = (struct kinfo_proc *)malloc(length); + + mib[5] = (length / sizeof(struct kinfo_proc)); + + if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) + goto out; + + if ((info->p_flag & P_SYSTEM) != 0) + goto out; + + if (strcmp(info->p_comm, "chrome") == 0) { + path = info->p_comm; + goto out; + } + +out: + free(info); + return FilePath(path); } } // namespace base