jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-12-28 23:03:01 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

increased numplate and car dirt code safety (null entries properly now, don't allow for a buffer overrun in strcpy_s)

Browse source
This commit is contained in:
Silent 2017-04-09 23:17:31 +02:00
parent 98055b9f3f
commit 6e470ab20d
4 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SilentPatchSA/ModelInfoSA.cpp
View file

@ -22,7 +22,7 @@ void CVehicleModelInfo::Shutdown()
void CVehicleModelInfo::FindEditableMaterialList() void CVehicleModelInfo::FindEditableMaterialList()
{ {
int materialCount = 0; size_t materialCount = 0;
auto GetEditableMaterialListCB = [&]( RpAtomic* atomic ) -> RpAtomic* { auto GetEditableMaterialListCB = [&]( RpAtomic* atomic ) -> RpAtomic* {
RpGeometryForAllMaterials( RpAtomicGetGeometry(atomic), [&]( RpMaterial* material ) -> RpMaterial* { RpGeometryForAllMaterials( RpAtomicGetGeometry(atomic), [&]( RpMaterial* material ) -> RpMaterial* {
@ -44,11 +44,8 @@ void CVehicleModelInfo::FindEditableMaterialList()
RpClumpForAllAtomics(reinterpret_cast<RpClump*>(pRwObject), GetEditableMaterialListCB); RpClumpForAllAtomics(reinterpret_cast<RpClump*>(pRwObject), GetEditableMaterialListCB);
if ( m_pVehicleStruct->m_nNumExtras > 0 ) for ( uint32_t i = 0; i < m_pVehicleStruct->m_nNumExtras; i++ )
{ GetEditableMaterialListCB(m_pVehicleStruct->m_apExtras[i]);
for ( int i = 0; i < m_pVehicleStruct->m_nNumExtras; i++ )
GetEditableMaterialListCB(m_pVehicleStruct->m_apExtras[i]);
}
m_nPrimaryColor = -1; m_nPrimaryColor = -1;
m_nSecondaryColor = -1; m_nSecondaryColor = -1;

6
SilentPatchSA/ModelInfoSA.h
View file

@ -225,8 +225,10 @@ public:
class NOVMT CVehicleModelInfo : public CClumpModelInfo class NOVMT CVehicleModelInfo : public CClumpModelInfo
{ {
public: public:
static const size_t PLATE_TEXT_LEN = 8;
RpMaterial** m_apPlateMaterials; // Changed in SilentPatchh RpMaterial** m_apPlateMaterials; // Changed in SilentPatchh
char m_plateText[8]; char m_plateText[PLATE_TEXT_LEN];
char field_30; char field_30;
signed char m_nPlateType; signed char m_nPlateType;
char m_nGameName[8]; char m_nGameName[8];
@ -261,7 +263,7 @@ public:
CVector m_avDummyPosn[15]; CVector m_avDummyPosn[15];
UpgradePosnDesc m_aUpgrades[18]; UpgradePosnDesc m_aUpgrades[18];
RpAtomic* m_apExtras[6]; RpAtomic* m_apExtras[6];
unsigned char m_nNumExtras; uint8_t m_nNumExtras;
unsigned int m_dwMaskComponentsDamagable; unsigned int m_dwMaskComponentsDamagable;
} *m_pVehicleStruct; } *m_pVehicleStruct;

14
SilentPatchSA/SilentPatchSA.cpp
View file

@ -1115,6 +1115,15 @@ bool __stdcall CheckDoubleRWheelsList( void* modelInfo, uint8_t* handlingData )
return lastResult; return lastResult;
} }
CVehicleModelInfo* (__thiscall *orgVehicleModelInfoCtor)(CVehicleModelInfo*);
CVehicleModelInfo* __fastcall VehicleModelInfoCtor(CVehicleModelInfo* me)
{
orgVehicleModelInfoCtor(me);
me->m_apPlateMaterials = nullptr;
std::fill( std::begin(me->m_apDirtMaterials), std::end(me->m_apDirtMaterials), nullptr );
return me;
}
#pragma warning(push) #pragma warning(push)
#pragma warning(disable:4838) #pragma warning(disable:4838)
#include <xnamath.h> #include <xnamath.h>
@ -3249,6 +3258,11 @@ void Patch_SA_10()
InjectHook( 0x4C9239+2, CheckDoubleRWheelsList, PATCH_CALL ); InjectHook( 0x4C9239+2, CheckDoubleRWheelsList, PATCH_CALL );
Patch<uint16_t>( 0x4C9239+7, 0xC084 ); Patch<uint16_t>( 0x4C9239+7, 0xC084 );
Nop( 0x4C9239+9, 1 ); Nop( 0x4C9239+9, 1 );
// Properly initialize all CVehicleModelInfo fields
ReadCall( 0x4C75E4, orgVehicleModelInfoCtor );
InjectHook( 0x4C75E4, VehicleModelInfoCtor );
} }
void Patch_SA_11() void Patch_SA_11()

8
SilentPatchSA/VehicleSA.cpp
View file

@ -97,16 +97,16 @@ void CVehicle::SetComponentAtomicAlpha(RpAtomic* pAtomic, int nAlpha)
bool CVehicle::CustomCarPlate_TextureCreate(CVehicleModelInfo* pModelInfo) bool CVehicle::CustomCarPlate_TextureCreate(CVehicleModelInfo* pModelInfo)
{ {
char PlateText[10]; char PlateText[CVehicleModelInfo::PLATE_TEXT_LEN+1];
const char* pOverrideText = pModelInfo->GetCustomCarPlateText(); const char* pOverrideText = pModelInfo->GetCustomCarPlateText();
if ( pOverrideText ) if ( pOverrideText )
strcpy_s(PlateText, pOverrideText); strncpy_s(PlateText, pOverrideText, CVehicleModelInfo::PLATE_TEXT_LEN);
else else
CCustomCarPlateMgr::GeneratePlateText(PlateText, 8); CCustomCarPlateMgr::GeneratePlateText(PlateText, CVehicleModelInfo::PLATE_TEXT_LEN);
PlateText[CVehicleModelInfo::PLATE_TEXT_LEN] = '\0';
PlateTexture = CCustomCarPlateMgr::CreatePlateTexture(PlateText, pModelInfo->m_nPlateType); PlateTexture = CCustomCarPlateMgr::CreatePlateTexture(PlateText, pModelInfo->m_nPlateType);
//PlateDesign = pModelInfo->m_nPlateType != -1 ? pModelInfo->m_nPlateType : CCustomCarPlateMgr::GetMapRegionPlateDesign();
if ( pModelInfo->m_nPlateType != -1 ) if ( pModelInfo->m_nPlateType != -1 )
PlateDesign = pModelInfo->m_nPlateType; PlateDesign = pModelInfo->m_nPlateType;
else if ( IsLawEnforcementVehicle() ) else if ( IsLawEnforcementVehicle() )