Skip to content

Fix SIGSEGV in /frm config on dedicated servers #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coredmp95 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix SIGSEGV in /frm config on dedicated servers #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Source/FicsitRemoteMonitoring/Private/Commands/multi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,14 @@ FChatReturn AFRMCommand::RemoteMonitoringCommand(UObject* WorldContext, UCommand
FString arg1 = Arguments[1].ToLower();
FString arg2 = Arguments[2].ToLower();

AFGPlayerController* PlayerController = Cast<AFGPlayerController>(Sender->GetPlayer()->GetControlledCharacter()->GetLocalViewingPlayerController());
EPrivilegeLevel PrivilegeLevel = PlayerController->GetDSPrivilegeLevel();
// UCommandSender::GetPlayer() already returns the sender's server-side AFGPlayerController.
// The previous GetControlledCharacter()->GetLocalViewingPlayerController() detour is null on a
// dedicated server (no local client) and crashed (SIGSEGV) on ANY /frm config. A null controller
// here means a non-player/console sender, which we treat as trusted.
AFGPlayerController* PlayerController = Sender ? Sender->GetPlayer() : nullptr;
// A null (console/non-player) sender is trusted -> InitialAdmin so the check below passes and
// short-circuits before ever calling GetNetMode() on the null controller.
const EPrivilegeLevel PrivilegeLevel = IsValid(PlayerController) ? PlayerController->GetDSPrivilegeLevel() : EPrivilegeLevel::InitialAdmin;

if (PrivilegeLevel != EPrivilegeLevel::Administrator &&
PrivilegeLevel != EPrivilegeLevel::InitialAdmin &&
Expand All @@ -145,7 +151,8 @@ FChatReturn AFRMCommand::RemoteMonitoringCommand(UObject* WorldContext, UCommand
ChatReturn.Chat = FString(TEXT("Insufficient Permissions to set " + arg1 + " to " +arg2));
ChatReturn.Color = FLinearColor::Red;
ChatReturn.Status = EExecutionStatus::COMPLETED;
}
return ChatReturn;
}

if (UFRMConfigManager::SetConfigFromInput(arg1, arg2))
{
Expand Down