hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 13:09:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

hyprctl: avoid crash on null pwuid

Browse source 
fixes #8693
This commit is contained in:
Vaxry 2024-12-13 22:36:35 +00:00
parent 8237627f3a
commit 3cba4ba44e
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hyprctl/main.cpp
View file

@ -52,11 +52,17 @@ void log(const std::string& str) {
std::println("{}", str); std::println("{}", str);
} }
static int getUID() {
const auto UID = getuid();
const auto PWUID = getpwuid(UID);
return PWUID ? PWUID->pw_uid : UID;
}
std::string getRuntimeDir() { std::string getRuntimeDir() {
const auto XDG = getenv("XDG_RUNTIME_DIR"); const auto XDG = getenv("XDG_RUNTIME_DIR");
if (!XDG) { if (!XDG) {
const std::string USERID = std::to_string(getpwuid(getuid())->pw_uid); const std::string USERID = std::to_string(getUID());
return "/run/user/" + USERID + "/hypr"; return "/run/user/" + USERID + "/hypr";
} }
@ -168,7 +174,7 @@ int request(std::string arg, int minArgs = 0, bool needRoll = false) {
return 2; return 2;
} }
const std::string USERID = std::to_string(getpwuid(getuid())->pw_uid); const std::string USERID = std::to_string(getUID());
sockaddr_un serverAddress = {0}; sockaddr_un serverAddress = {0};
serverAddress.sun_family = AF_UNIX; serverAddress.sun_family = AF_UNIX;
@ -238,7 +244,7 @@ int requestHyprpaper(std::string arg) {
sockaddr_un serverAddress = {0}; sockaddr_un serverAddress = {0};
serverAddress.sun_family = AF_UNIX; serverAddress.sun_family = AF_UNIX;
const std::string USERID = std::to_string(getpwuid(getuid())->pw_uid); const std::string USERID = std::to_string(getUID());
std::string socketPath = getRuntimeDir() + "/" + instanceSignature + "/.hyprpaper.sock"; std::string socketPath = getRuntimeDir() + "/" + instanceSignature + "/.hyprpaper.sock";