Robot
/
btop
mirror of https://github.com/aristocratos/btop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed: Restrict command line for processes to 1000 characters to fix utf8 conversion errors

This commit is contained in:
aristocratos 2022-02-20 00:27:03 +01:00
parent 4e7a212f83
commit 7b3d996a73
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/freebsd/btop_collect.cpp
View File

@ -1201,12 +1201,16 @@ namespace Proc {
new_proc.name = kproc->ki_comm;
char** argv = kvm_getargv(kd(), kproc, 0);
if (argv) {
for (int i = 0; argv[i]; i++) {
for (int i = 0; argv[i] and cmp_less(new_proc.cmd.size(), 1000); i++) {
new_proc.cmd += argv[i] + " "s;
}
if (not new_proc.cmd.empty()) new_proc.cmd.pop_back();
}
if (new_proc.cmd.empty()) new_proc.cmd = new_proc.name;
if (new_proc.cmd.size() > 1000) {
new_proc.cmd.resize(1000);
new_proc.cmd.shrink_to_fit();
}
new_proc.ppid = kproc->ki_ppid;
new_proc.cpu_s = round(kproc->ki_start.tv_sec);
struct passwd *pwd = getpwuid(kproc->ki_uid);

6
src/osx/btop_collect.cpp
View File

@ -1258,7 +1258,7 @@ namespace Proc {
std::string_view proc_args(proc_chars.get(), argmax);
if (size_t null_pos = proc_args.find('\0', sizeof(argc)); null_pos != string::npos) {
if (size_t start_pos = proc_args.find_first_not_of('\0', null_pos); start_pos != string::npos) {
while (argc-- > 0 and null_pos != string::npos) {
while (argc-- > 0 and null_pos != string::npos and cmp_less(new_proc.cmd.size(), 1000)) {
null_pos = proc_args.find('\0', start_pos);
new_proc.cmd += (string)proc_args.substr(start_pos, null_pos - start_pos) + ' ';
start_pos = null_pos + 1;
@ -1269,6 +1269,10 @@ namespace Proc {
}
}
if (new_proc.cmd.empty()) new_proc.cmd = f_name;
if (new_proc.cmd.size() > 1000) {
new_proc.cmd.resize(1000);
new_proc.cmd.shrink_to_fit();
}
new_proc.ppid = kproc.kp_eproc.e_ppid;
new_proc.cpu_s = kproc.kp_proc.p_starttime.tv_sec * 1'000'000 + kproc.kp_proc.p_starttime.tv_usec;
struct passwd *pwd = getpwuid(kproc.kp_eproc.e_ucred.cr_uid);