ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2025-01-08 10:23:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(ReceivedCloneSync): Check before casting (#574)

Browse Source
This commit is contained in:
Yimura 2022-11-11 19:43:49 +01:00 committed by GitHub
parent 134da381de
commit 532cf59b4f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hooks/protections/received_clone_sync.cpp
View File

@ -364,7 +364,7 @@ namespace big
} }
else if (auto game_obj = net_obj->GetGameObject(); game_obj) else if (auto game_obj = net_obj->GetGameObject(); game_obj)
{ {
if (auto model_info = game_obj->m_model_info) if (const auto model_info = game_obj->m_model_info; model_info)
{ {
const auto model = model_info::get_model(model_info->m_hash); const auto model = model_info::get_model(model_info->m_hash);
if (!model || model_info->m_model_type != model->m_model_type) if (!model || model_info->m_model_type != model->m_model_type)
@ -377,10 +377,19 @@ namespace big
{ {
return eSyncReply::WrongOwner; return eSyncReply::WrongOwner;
} }
else if ((sync_type >= eObjType::bikeObjType && sync_type <= eObjType::heliObjType) || (sync_type >= eObjType::planeObjType && sync_type <= eObjType::submarineObjType) || (sync_type >= eObjType::trailerObjType && sync_type <= eObjType::trainObjType))
// sync_type is telling us it's a vehicle
// let's check if it's actually a vehicle according to our game...
if ((sync_type >= eObjType::bikeObjType && sync_type <= eObjType::heliObjType)
|| (sync_type >= eObjType::planeObjType && sync_type <= eObjType::submarineObjType)
|| (sync_type >= eObjType::trailerObjType && sync_type <= eObjType::trainObjType))
{ {
if(reinterpret_cast<CVehicleModelInfo*>(model_info)->m_vehicle_type != model_info::get_vehicle_model(model_info->m_hash)->m_vehicle_type) if (const auto model = model_info::get_vehicle_model(model_info->m_hash); !model // model valid
&& model_info->m_model_type != eModelType::Vehicle // is our model returned by the game a vehicle?
&& reinterpret_cast<CVehicleModelInfo*>(model_info)->m_vehicle_type != model->m_vehicle_type) // final check
{
return eSyncReply::WrongOwner; return eSyncReply::WrongOwner;
}
} }
} }
} }