Skip to content

CModelInfoSA exceeds an array boundaries #155

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

Merged
merged 1 commit into from
Feb 20, 2018
Merged

CModelInfoSA exceeds an array boundaries #155

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
17 changes: 11 additions & 6 deletions Client/game_sa/CModelInfoSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,17 +484,21 @@ BOOL CModelInfoSA::IsLoaded ( )

BOOL CModelInfoSA::DoIsLoaded ( )
{
DEBUG_TRACE("BOOL CModelInfoSA::IsLoaded ( )");
DEBUG_TRACE("BOOL CModelInfoSA::DoIsLoaded ( )");

//return (BOOL)*(BYTE *)(ARRAY_ModelLoaded + 20*dwModelID);
BOOL bLoaded = pGame->GetStreaming()->HasModelLoaded(m_dwModelID);
m_pInterface = ppModelInfo [ m_dwModelID ];

if ( bLoaded && m_dwModelID < 20000 )
if ( m_dwModelID < 20000 )
{
// Check rw object is there
if ( !m_pInterface || !m_pInterface->pRwObject )
return false;
m_pInterface = ppModelInfo[m_dwModelID];

if ( bLoaded )
{
// Check rw object is there
if (!m_pInterface || !m_pInterface->pRwObject)
return false;
}
}
return bLoaded;
}
Expand Down Expand Up @@ -531,6 +535,7 @@ CBoundingBox * CModelInfoSA::GetBoundingBox ( )

bool CModelInfoSA::IsValid ( )
{
if ( m_dwModelID >= 20000 && m_dwModelID < MODELINFO_MAX ) return true;
return ppModelInfo [ m_dwModelID ] != 0;
}

Expand Down