RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:18:14 +00:00
Code Issues Activity Actions

ps: Select user-specified processes only when the -q option is used

Browse source 
This fixes a logic bug which allowed processes not specified by the
user to be selected when the `-q` option was used. This caused the
program to crash when sorting processes into the correct order.
This commit is contained in:
Tim Ledbetter 2023-07-12 17:42:40 +01:00 • committed by Sam Atkins
parent dd1156fb17
commit cdb15a20ff
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Utilities/ps.cpp
View file

@ -218,9 +218,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& processes = all_processes.processes; auto& processes = all_processes.processes;
// Filter // Filter
if (!every_process_flag) { Vector<Core::ProcessStatistics> filtered_processes;
Vector<Core::ProcessStatistics> filtered_processes; if (provided_quick_pid_list) {
for (auto pid : pid_list) {
auto maybe_process = processes.first_matching([=](auto const& process) { return process.pid == pid; });
if (maybe_process.has_value())
filtered_processes.append(maybe_process.release_value());
}
processes = move(filtered_processes);
} else if (!every_process_flag) {
for (auto const& process : processes) { for (auto const& process : processes) {
// Default is to show processes from the current TTY // Default is to show processes from the current TTY
if ((!provided_filtering_option && process.tty == this_pseudo_tty_name.bytes_as_string_view()) if ((!provided_filtering_option && process.tty == this_pseudo_tty_name.bytes_as_string_view())
@ -237,14 +244,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
// Sort // Sort
if (provided_quick_pid_list) { if (!provided_quick_pid_list)
auto processes_sort_predicate = [&pid_list](auto& a, auto& b) {
return pid_list.find_first_index(a.pid).value() < pid_list.find_first_index(b.pid).value();
};
quick_sort(processes, processes_sort_predicate);
} else {
quick_sort(processes, [](auto& a, auto& b) { return a.pid < b.pid; }); quick_sort(processes, [](auto& a, auto& b) { return a.pid < b.pid; });
}
Vector<Vector<String>> rows; Vector<Vector<String>> rows;
TRY(rows.try_ensure_capacity(1 + processes.size())); TRY(rows.try_ensure_capacity(1 + processes.size()));