R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Launcher: fix use after free (ASAN)

Browse Source 
The launcher would regularly throw the PSA (Program Compatibility Assistance) notification upon exit. Running the program with address sanitizer revealed 'CSurface::GetControlValue()' returned a pointer to a temporary buffer, this is destroyed as 'Forms::Control::Text()' returns class String by value. 'CSurface::GetControlValue()' is no longer necessary since we moved to the official KeyValues class, so this function has been removed all together and the issue has therefore been fixed.
This commit is contained in:
Kawe Mazidjatari 2024-04-20 23:08:31 +02:00
parent 7bc7c9d2f4
commit bf0cef130d
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/sdklauncher/basepanel.cpp
View File

@ -58,7 +58,7 @@ void CSurface::Init()
this->SetBackColor(Drawing::Color(47, 54, 61));
this->Load += &OnLoad;
this->FormClosing += &OnClose;
this->Closing += &OnClose;
// ########################################################################
// GAME
@ -648,16 +648,16 @@ void CSurface::SaveSettings()
kv.AddSubKey(sv);
// Game.
sv->SetString("playlistsFile", GetControlValue(this->m_PlaylistFileTextBox));
sv->SetString("playlistsFile", this->m_PlaylistFileTextBox->Text().ToCString());
sv->SetBool("enableCheats", this->m_CheatsToggle->Checked());
sv->SetBool("enableDeveloper", this->m_DeveloperToggle->Checked());
sv->SetBool("enableConsole", this->m_ConsoleToggle->Checked());
sv->SetBool("colorConsole", this->m_ColorConsoleToggle->Checked());
// Engine.
sv->SetString("reservedCoreCount", GetControlValue(this->m_ReservedCoresTextBox));
sv->SetString("workerThreadCount", GetControlValue(this->m_WorkerThreadsTextBox));
sv->SetString("processorAffinity", GetControlValue(this->m_ProcessorAffinityTextBox));
sv->SetString("reservedCoreCount", this->m_ReservedCoresTextBox->Text().ToCString());
sv->SetString("workerThreadCount", this->m_WorkerThreadsTextBox->Text().ToCString());
sv->SetString("processorAffinity", this->m_ProcessorAffinityTextBox->Text().ToCString());
sv->SetBool("noAsync", this->m_NoAsyncJobsToggle->Checked());
// Network.
@ -669,9 +669,9 @@ void CSurface::SaveSettings()
// Video.
sv->SetBool("windowed", this->m_WindowedToggle->Checked());
sv->SetBool("borderless", this->m_NoBorderToggle->Checked());
sv->SetString("fpsMax", GetControlValue(this->m_FpsTextBox));
sv->SetString("width", GetControlValue(this->m_WidthTextBox));
sv->SetString("height", GetControlValue(this->m_HeightTextBox));
sv->SetString("fpsMax", this->m_FpsTextBox->Text().ToCString());
sv->SetString("width", this->m_WidthTextBox->Text().ToCString());
sv->SetString("height", this->m_HeightTextBox->Text().ToCString());
CUtlBuffer outBuf(ssize_t(0), 0, CUtlBuffer::TEXT_BUFFER);
kv.RecursiveSaveToFile(outBuf, 0);
@ -1298,26 +1298,6 @@ uint64_t CSurface::GetProcessorAffinity(string& svParameters)
return nProcessorAffinity;
}
//-----------------------------------------------------------------------------
// Purpose: gets the control item value
// Input : *pControl -
//-----------------------------------------------------------------------------
const char* CSurface::GetControlValue(Forms::Control* pControl)
{
switch (pControl->GetType())
{
case Forms::ControlTypes::CheckBox:
case Forms::ControlTypes::RadioButton:
{
return reinterpret_cast<UIX::UIXCheckBox*>(pControl)->Checked() ? "1" : "0";
}
default:
{
return pControl->Text().ToCString();
}
}
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------

1
src/sdklauncher/basepanel.h
View File

@ -45,7 +45,6 @@ private:
static void GetVirtualItem(const std::unique_ptr<Forms::RetrieveVirtualItemEventArgs>& pEventArgs, Forms::Control* pSender);
static void ForwardCommandToGame(Forms::Control* pSender);
const char* GetControlValue(Forms::Control* pControl);
uint64_t GetProcessorAffinity(string& szParameter);
void AppendParameterInternal(string& svParameterList, const char* szParameter, const char* szArgument = nullptr);