system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 12:23:15 +00:00
Code Issues Packages Projects Releases 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
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");
return Error::from_errno(saved_errno);
}
int tty_device_major = major(tty_stat.st_rdev);
int tty_device_minor = minor(tty_stat.st_rdev);
if (tty_device_major == 201) {
return String::formatted("pts:{}", tty_device_minor);
}
if (tty_device_major == 4) {
return String::formatted("tty:{}", tty_device_minor);
}
VERIFY_NOT_REACHED();
return "n/a";
}
ErrorOr<int> serenity_main(Main::Arguments arguments)