Skip to content

Fix crash in CModelInfoSA::MakeObjectModel with weapon-based objects #4951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheCrazy17 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

Fix crash in CModelInfoSA::MakeObjectModel with weapon-based objects #4951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Client/game_sa/CModelInfoSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1859,14 +1859,19 @@ void CModelInfoSA::MakePedModel(const char* szTexture)

void CModelInfoSA::MakeObjectModel(ushort usBaseID)
{
CBaseModelInfoSAInterface* m_pInterface = new CBaseModelInfoSAInterface();
// Allocate at least a CClumpModelInfoSAInterface: the base model's vtable (copied below) may be a
// CClumpModelInfo-derived one (e.g. weapons), whose GetAnimFileIndex() reads m_nAnimFileIndex at
// offset sizeof(CBaseModelInfoSAInterface). Allocating only the base size would make that an
// out-of-bounds read/write.
CClumpModelInfoSAInterface* m_pInterface = new CClumpModelInfoSAInterface();

CBaseModelInfoSAInterface* pBaseObjectInfo = ppModelInfo[usBaseID];
MemCpyFast(m_pInterface, pBaseObjectInfo, sizeof(CBaseModelInfoSAInterface));
MemCpyFast(m_pInterface, pBaseObjectInfo, sizeof(CClumpModelInfoSAInterface));
m_pInterface->usNumberOfRefs = 0;
m_pInterface->pRwObject = nullptr;
m_pInterface->usUnknown = 65535;
m_pInterface->usDynamicIndex = 65535;
m_pInterface->m_nAnimFileIndex = 0xFFFFFFFF;

ppModelInfo[m_dwModelID] = m_pInterface;

Expand Down