From 216756b3f4eb300e6e3dfd4ac16e4e678c469a3c Mon Sep 17 00:00:00 2001 From: Neloreck Date: Mon, 16 Oct 2023 22:06:55 +0300 Subject: [PATCH 1/2] Fix binder packet reader data access. --- src/xrGame/WeaponMagazinedWGrenade.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xrGame/WeaponMagazinedWGrenade.cpp b/src/xrGame/WeaponMagazinedWGrenade.cpp index 974ca83fbb0..4c20725f36b 100644 --- a/src/xrGame/WeaponMagazinedWGrenade.cpp +++ b/src/xrGame/WeaponMagazinedWGrenade.cpp @@ -790,7 +790,7 @@ void CWeaponMagazinedWGrenade::load(IReader& input_packet) if (b != m_bGrenadeMode) SwitchMode(); - u32 sz = 0; + size_t sz = 0; load_data(sz, input_packet); CCartridge l_cartridge; From b43f5a6c9852db56be1ab9aa368dfb4703e1de1c Mon Sep 17 00:00:00 2001 From: Neloreck Date: Tue, 17 Oct 2023 22:53:12 +0300 Subject: [PATCH 2/2] Explicit u32 cast for size type to maintain WeaponWGrenade compatibility in 32 and 64 bit. --- src/xrGame/WeaponMagazinedWGrenade.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xrGame/WeaponMagazinedWGrenade.cpp b/src/xrGame/WeaponMagazinedWGrenade.cpp index 4c20725f36b..875363f14fd 100644 --- a/src/xrGame/WeaponMagazinedWGrenade.cpp +++ b/src/xrGame/WeaponMagazinedWGrenade.cpp @@ -779,7 +779,7 @@ void CWeaponMagazinedWGrenade::save(NET_Packet& output_packet) { inherited::save(output_packet); save_data(m_bGrenadeMode, output_packet); - save_data(m_magazine2.size(), output_packet); + save_data(static_cast(m_magazine2.size()), output_packet); } void CWeaponMagazinedWGrenade::load(IReader& input_packet) @@ -790,7 +790,7 @@ void CWeaponMagazinedWGrenade::load(IReader& input_packet) if (b != m_bGrenadeMode) SwitchMode(); - size_t sz = 0; + u32 sz = 0; load_data(sz, input_packet); CCartridge l_cartridge;