mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-23 01:32:14 -05:00
Code Issues Projects Releases Packages Wiki Activity

Userland: Fix crash when inputting non-tty device into ps

Browse source 
This PR aims to fix #13299 by avoiding assertion failure
while trying to determine the pseudo tty when inputting
any non-tty device device into ps.
This commit is contained in:
Thomas Symalla 2022-03-30 10:22:27 +02:00 committed by Andreas Kling
parent 2ecc608dea
commit 77add584fa
Notes: sideshowbarker 2024-07-19 17:06:55 +09:00 
Author: https://github.com/tsymalla 🔰
Commit: https://github.com/SerenityOS/serenity/commit/77add584fa8
Pull-request: https://github.com/SerenityOS/serenity/pull/13352
Reviewed-by: https://github.com/Hendiadyoin1
Reviewed-by: https://github.com/awesomekling
Reviewed-by: https://github.com/supercomputer7 ✅
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Userland/Utilities/ps.cpp
View file

@ -20,15 +20,18 @@ static ErrorOr<String> determine_tty_pseudo_name()
perror("fstat"); perror("fstat");
return Error::from_errno(saved_errno); return Error::from_errno(saved_errno);
} }
int tty_device_major = major(tty_stat.st_rdev); int tty_device_major = major(tty_stat.st_rdev);
int tty_device_minor = minor(tty_stat.st_rdev); int tty_device_minor = minor(tty_stat.st_rdev);
if (tty_device_major == 201) { if (tty_device_major == 201) {
return String::formatted("pts:{}", tty_device_minor); return String::formatted("pts:{}", tty_device_minor);
} }
if (tty_device_major == 4) { if (tty_device_major == 4) {
return String::formatted("tty:{}", tty_device_minor); return String::formatted("tty:{}", tty_device_minor);
} }
VERIFY_NOT_REACHED(); return "n/a";
} }
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)