Additional weapon/bsync handling improvements, and move check from ca22eda to CWeaponStatManager

Author: Dutchman101

Client/mods/deathmatch/logic/CClientWeaponManager.cpp

@@ -43,4 +43,9 @@ void CClientWeaponManager::DoPulse()
     {
         (*iter)->DoPulse();
     }
-}
+}
+
+bool CClientWeaponManager::HasWeaponBulletSync(std::uint32_t weaponID) noexcept
+{
+    return weaponID >= 22 && weaponID <= 34;
+}

Client/mods/deathmatch/logic/CClientWeaponManager.h

@@ -23,6 +23,8 @@ class CClientWeaponManager
 
     void DoPulse();
 
+    static bool HasWeaponBulletSync(std::uint32_t weaponID) noexcept;
+
 private:
     void AddToList(CClientWeapon* pWeapon) { m_Weapons.push_back(pWeapon); }
     void RemoveFromList(CClientWeapon* pWeapon);

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -2271,27 +2271,31 @@ void CNetAPI::ReadBulletsync(CClientPlayer* pPlayer, NetBitStreamInterface& BitS
 {
     // Read the bulletsync data
     uchar ucWeapon = 0;
-    BitStream.Read(ucWeapon);
-    if (!CClientPickupManager::IsValidWeaponID(ucWeapon))
+    if (!BitStream.Read(ucWeapon) || !CClientWeaponManager::HasWeaponBulletSync(ucWeapon))
         return;
+
     eWeaponType weaponType = (eWeaponType)ucWeapon;
 
     CVector vecStart, vecEnd;
-    BitStream.Read((char*)&vecStart, sizeof(CVector));
-    BitStream.Read((char*)&vecEnd, sizeof(CVector));
+    if (!BitStream.Read((char*)&vecStart, sizeof(CVector)) || !BitStream.Read((char*)&vecEnd, sizeof(CVector)))
+        return;
+
+    if (!vecStart.IsValid() || !vecEnd.IsValid())
+        return;
 
     uchar ucOrderCounter = 0;
-    BitStream.Read(ucOrderCounter);
+    if (!BitStream.Read(ucOrderCounter))
+        return;
 
     float          fDamage = 0;
     uchar          ucHitZone = 0;
     CClientPlayer* pDamagedPlayer = NULL;
     if (BitStream.ReadBit())
     {
         ElementID DamagedPlayerID = INVALID_ELEMENT_ID;
-        BitStream.Read(fDamage);
-        BitStream.Read(ucHitZone);
-        BitStream.Read(DamagedPlayerID);
+        if (!BitStream.Read(fDamage) || !BitStream.Read(ucHitZone) || !BitStream.Read(DamagedPlayerID))
+            return;
+
         pDamagedPlayer = DynamicCast<CClientPlayer>(CElementIDs::GetElement(DamagedPlayerID));
     }
 
@@ -2328,15 +2332,20 @@ void CNetAPI::ReadWeaponBulletsync(CClientPlayer* pPlayer, NetBitStreamInterface
 {
     // Read the bulletsync data
     ElementID elementID;
-    BitStream.Read(elementID);
+    if (!BitStream.Read(elementID))
+        return;
+
     CClientWeapon* pWeapon = DynamicCast<CClientWeapon>(CElementIDs::GetElement(elementID));
+    if (!pWeapon || !CClientWeaponManager::HasWeaponBulletSync(pWeapon->GetWeaponType()))
+        return;
 
     CVector vecStart, vecEnd;
-    BitStream.Read((char*)&vecStart, sizeof(CVector));
-    BitStream.Read((char*)&vecEnd, sizeof(CVector));
+    if (!BitStream.Read((char*)&vecStart, sizeof(CVector)) || !BitStream.Read((char*)&vecEnd, sizeof(CVector)))
+        return;
 
     uchar ucOrderCounter = 0;
-    BitStream.Read(ucOrderCounter);
+    if (!BitStream.Read(ucOrderCounter))
+        return;
 
     pWeapon->FireInstantHit(vecStart, vecEnd, false, true);
 }

Server/mods/deathmatch/logic/CPickupManager.cpp

@@ -68,11 +68,6 @@ bool CPickupManager::IsValidWeaponID(unsigned int uiWeaponID)
     return (uiWeaponID > 0 && uiWeaponID != 13 && uiWeaponID != 19 && uiWeaponID != 20 && uiWeaponID != 21 && uiWeaponID <= 46);
 }
 
-bool CPickupManager::HasWeaponBulletSync(uint32_t weaponID)
-{
-    return weaponID >= 22 && weaponID <= 34;
-}
-
 unsigned short CPickupManager::GetWeaponModel(unsigned int uiWeaponID)
 {
     if (uiWeaponID <= 46)

Server/mods/deathmatch/logic/CPickupManager.h

@@ -36,7 +36,6 @@ class CPickupManager
     std::list<CPickup*>::const_iterator IterEnd() { return m_List.end(); };
 
     static bool           IsValidWeaponID(unsigned int uiWeaponID);
-    static bool           HasWeaponBulletSync(uint32_t weaponID);
     static unsigned short GetWeaponModel(unsigned int uiWeaponID);
     static unsigned short GetHealthModel() { return 1240; };
     static unsigned short GetArmorModel() { return 1242; };

Server/mods/deathmatch/logic/CWeaponStatManager.cpp

@@ -1675,3 +1675,8 @@ float CWeaponStatManager::GetWeaponRangeFromSkillLevel(eWeaponType eWeapon, floa
     }
     return fWeaponRange;
 }
+
+bool CWeaponStatManager::HasWeaponBulletSync(uint32_t weaponID) noexcept
+{
+    return weaponID >= 22 && weaponID <= 34;
+}

Server/mods/deathmatch/logic/CWeaponStatManager.h

@@ -91,6 +91,7 @@ class CWeaponStatManager
 
     // Static Methods
     static unsigned short GetSkillStatIndex(eWeaponType eWeapon);
+    static bool           HasWeaponBulletSync(uint32_t weaponID) noexcept;
 
 private:
     std::list<CWeaponStat*>                             m_OriginalWeaponData;

Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.cpp

@@ -10,6 +10,7 @@
 #include "StdInc.h"
 #include "SimHeaders.h"
 #include "CPickupManager.h"
+#include "CWeaponStatManager.h"
 
 CSimBulletsyncPacket::CSimBulletsyncPacket(ElementID PlayerID) : m_PlayerID(PlayerID)
 {
@@ -24,14 +25,16 @@ CSimBulletsyncPacket::CSimBulletsyncPacket(ElementID PlayerID) : m_PlayerID(Play
 //
 bool CSimBulletsyncPacket::Read(NetBitStreamInterface& BitStream)
 {
-    char cWeaponType;
-    BitStream.Read(cWeaponType);
-    if (!CPickupManager::HasWeaponBulletSync(cWeaponType))
+    char cWeaponType = 0;
+    if (!BitStream.Read(cWeaponType) || !CWeaponStatManager::HasWeaponBulletSync(cWeaponType))
         return false;
     m_Cache.weaponType = (eWeaponType)cWeaponType;
 
-    BitStream.Read((char*)&m_Cache.vecStart, sizeof(CVector));
-    BitStream.Read((char*)&m_Cache.vecEnd, sizeof(CVector));
+    if (!BitStream.Read((char*)&m_Cache.vecStart, sizeof(CVector)) || !BitStream.Read((char*)&m_Cache.vecEnd, sizeof(CVector)))
+        return false;
+
+    if (!m_Cache.vecStart.IsValid() || !m_Cache.vecEnd.IsValid())
+        return false;
 
     // Duplicate packet protection
     if (!BitStream.Read(m_Cache.ucOrderCounter))

Server/mods/deathmatch/logic/packets/CBulletsyncPacket.cpp

@@ -12,6 +12,7 @@
 #include "CBulletsyncPacket.h"
 #include "net/SyncStructures.h"
 #include "CPlayer.h"
+#include "CWeaponStatManager.h"
 
 CBulletsyncPacket::CBulletsyncPacket(CPlayer* pPlayer)
 {
@@ -28,12 +29,16 @@ bool CBulletsyncPacket::Read(NetBitStreamInterface& BitStream)
     // Got a player?
     if (m_pSourceElement)
     {
-        char cWeaponType;
-        BitStream.Read(cWeaponType);
+        char cWeaponType = 0;
+        if (!BitStream.Read(cWeaponType) || !CWeaponStatManager::HasWeaponBulletSync(cWeaponType))
+            return false;
         m_WeaponType = (eWeaponType)cWeaponType;
 
-        BitStream.Read((char*)&m_vecStart, sizeof(CVector));
-        BitStream.Read((char*)&m_vecEnd, sizeof(CVector));
+        if (!BitStream.Read((char*)&m_vecStart, sizeof(CVector)) || !BitStream.Read((char*)&m_vecEnd, sizeof(CVector)))
+            return false;
+
+        if (!m_vecStart.IsValid() || !m_vecEnd.IsValid())
+            return false;
 
         // Duplicate packet protection
         if (!BitStream.Read(m_ucOrderCounter))

Shared/sdk/CVector.h

@@ -194,6 +194,18 @@ class CVector
         return false;
     }
 
+    bool IsValid() const
+    {
+        const float values[3] = {fX, fY, fZ};
+        for (std::size_t i = 0; i < 3; ++i)
+        {
+            if (std::isnan(values[i]) || std::isinf(values[i]))
+                return false;
+        }
+
+        return true;
+    }
+
     constexpr CVector operator+(const CVector& vecRight) const noexcept { return CVector(fX + vecRight.fX, fY + vecRight.fY, fZ + vecRight.fZ); }
 
     constexpr CVector operator-(const CVector& vecRight) const noexcept { return CVector(fX - vecRight.fX, fY - vecRight.fY, fZ - vecRight.fZ); }