Skip to content

0009139: fix invalid model ID in engine LOD functions cause a crash #299

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 7 commits into from
Feb 24, 2019
Merged

0009139: fix invalid model ID in engine LOD functions cause a crash #299

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
945a0a1
CLuaEngineDefs: fix invalid model ID engine LOD function crash
patrikjuvonen Aug 4, 2018
bf1206e
Merge branch 'master' into issue-9139
patrikjuvonen Aug 5, 2018
8c910e5
Addendum to previous commit, check for ped/veh models as well
patrikjuvonen Aug 6, 2018
0012edf
Merge branch 'master' into issue-9139
patrikjuvonen Aug 29, 2018
b6301e6
Merge remote-tracking branch 'upstream/master' into issue-9139
patrikjuvonen Feb 12, 2019
8f6b5a4
Merge remote-tracking branch 'upstream/master' into issue-9139
patrikjuvonen Feb 23, 2019
f7d5b19
Error out if model ID is over 20000 until we have a more permanent so…
patrikjuvonen Feb 24, 2019
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
49 changes: 30 additions & 19 deletions Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,23 +562,27 @@ int CLuaEngineDefs::EngineRestoreAnimation(lua_State* luaVM)
int CLuaEngineDefs::EngineGetModelLODDistance(lua_State* luaVM)
{
// float engineGetModelLODDistance ( int/string modelID )
SString strModelId;

SString strModelId;
CScriptArgReader argStream(luaVM);
argStream.ReadString(strModelId);

if (!argStream.HasErrors())
{
ushort usModelID = CModelNames::ResolveModelID(strModelId);
CModelInfo* pModelInfo = g_pGame->GetModelInfo(usModelID);
if (pModelInfo)
ushort usModelID = CModelNames::ResolveModelID(strModelId);
// Ensure we have a good model (GitHub #446)
if (usModelID < 20000)
{
float fDistance = pModelInfo->GetLODDistance();
lua_pushnumber(luaVM, fDistance);
return 1;
CModelInfo* pModelInfo = g_pGame->GetModelInfo(usModelID);
if (pModelInfo)
{
lua_pushnumber(luaVM, pModelInfo->GetLODDistance());
return 1;
}
}
else
argStream.SetCustomError(SString("Expected a valid model name or ID in range [0-19999] at argument 1, got \"%s\"", *strModelId));
}
else
if (argStream.HasErrors())
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

// Failed
Expand All @@ -588,24 +592,31 @@ int CLuaEngineDefs::EngineGetModelLODDistance(lua_State* luaVM)

int CLuaEngineDefs::EngineSetModelLODDistance(lua_State* luaVM)
{
SString strModel = "";
float fDistance = 0.0;
// bool engineSetModelLODDistance ( int/string modelID, float distance )
SString strModelId;
float fDistance;
CScriptArgReader argStream(luaVM);
argStream.ReadString(strModel);
argStream.ReadString(strModelId);
argStream.ReadNumber(fDistance);

if (!argStream.HasErrors())
{
unsigned short usModelID = CModelNames::ResolveModelID(strModel);
CModelInfo* pModelInfo = g_pGame->GetModelInfo(usModelID);
if (pModelInfo && fDistance > 0.0f)
ushort usModelID = CModelNames::ResolveModelID(strModelId);
// Ensure we have a good model (GitHub #446)
if (usModelID < 20000)
{
pModelInfo->SetLODDistance(fDistance);
lua_pushboolean(luaVM, true);
return 1;
CModelInfo* pModelInfo = g_pGame->GetModelInfo(usModelID);
if (pModelInfo && fDistance > 0.0f)
{
pModelInfo->SetLODDistance(fDistance);
lua_pushboolean(luaVM, true);
return 1;
}
}
else
argStream.SetCustomError(SString("Expected a valid model name or ID in range [0-19999] at argument 1, got \"%s\"", *strModelId));
}
else
if (argStream.HasErrors())
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);
Expand Down