ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2024-12-22 20:17:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed a race condition with scr_patch's destructor. (#3639)

Browse Source 
* Fixed a race condition caused by disabling and enabling a Lua script with scr_patch more than once.

* Fixed patch not being enabled if data is already created

---------

Co-authored-by: Arthur <121949966+ShinyWasabi@users.noreply.github.com>
This commit is contained in:
gir489 2024-09-02 01:52:34 -04:00 committed by GitHub
parent 707f2004ff
commit 706e6f7fc0
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lua/bindings/scr_patch.cpp
View File

@ -27,7 +27,6 @@ namespace lua::scr_patch
scr_patch::~scr_patch() scr_patch::~scr_patch()
{ {
disable();
big::g_script_patcher_service->remove_patch(m_patch_name); big::g_script_patcher_service->remove_patch(m_patch_name);
} }
@ -36,7 +35,7 @@ namespace lua::scr_patch
if (!m_enable) if (!m_enable)
{ {
m_enable = true; m_enable = true;
big::g_script_patcher_service->update_all_patches_for_script(m_script); big::g_script_patcher_service->update();
} }
} }
@ -45,7 +44,7 @@ namespace lua::scr_patch
if (m_enable) if (m_enable)
{ {
m_enable = false; m_enable = false;
big::g_script_patcher_service->update_all_patches_for_script(m_script); big::g_script_patcher_service->update();
} }
} }

3
src/services/script_patcher/script_patch.cpp
View File

@ -54,7 +54,10 @@ namespace big
{ {
auto result = get_code_location_by_pattern(data, m_pattern); auto result = get_code_location_by_pattern(data, m_pattern);
if (!result.has_value()) if (!result.has_value())
{
LOG(FATAL) << "Failed to find pattern: " << m_name; LOG(FATAL) << "Failed to find pattern: " << m_name;
return;
}
m_ip = result.value() + m_offset; m_ip = result.value() + m_offset;

10
src/services/script_patcher/script_patcher_service.cpp
View File

@ -87,11 +87,13 @@ namespace big
void script_patcher_service::on_script_load(rage::scrProgram* program) void script_patcher_service::on_script_load(rage::scrProgram* program)
{ {
if (get_data_for_script(program->m_name_hash) == nullptr && does_script_have_patches(program->m_name_hash)) if (!does_script_have_patches(program->m_name_hash))
{ return;
if (get_data_for_script(program->m_name_hash) == nullptr)
create_data_for_script(program); create_data_for_script(program);
update_all_patches_for_script(program->m_name_hash);
} update_all_patches_for_script(program->m_name_hash);
} }
uint8_t** script_patcher_service::get_script_bytecode(rage::joaat_t script) uint8_t** script_patcher_service::get_script_bytecode(rage::joaat_t script)