Skip to content

Fix use after free with script timing in LuaMan.cpp #220

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 2 commits into from
Oct 23, 2025
Merged

Fix use after free with script timing in LuaMan.cpp #220

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
392f25d
LuaMan.cpp - fix use after free with script timing
Architector4 Oct 1, 2025
d69a26d
NULL->nullptr
HeliumAnt Oct 2, 2025
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
18 changes: 13 additions & 5 deletions Source/Managers/LuaMan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,17 @@ int LuaStateWrapper::RunScriptFunctionObject(const LuabindObjectWrapper* functio
functionObjectArgument->GetLuabindObject()->push(m_State);
}
}

const std::string& path = functionObject->GetFilePath();

// Function object may be deleted during the Lua call, making `path` above invalid.
// Find and store the script timings entry now and write to it afterward.
PerformanceMan::ScriptTiming* timing = NULL;

// only track time in non-MT scripts, for now
if (&g_LuaMan.GetMasterScriptState() == this) {
timing = &m_ScriptTimings[path];
}

std::chrono::steady_clock::time_point begin = std::chrono::steady_clock::now();
{
ZoneScoped;
Expand All @@ -631,10 +640,9 @@ int LuaStateWrapper::RunScriptFunctionObject(const LuabindObjectWrapper* functio
}
std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();

// only track time in non-MT scripts, for now
if (&g_LuaMan.GetMasterScriptState() == this) {
m_ScriptTimings[path].m_Time += std::chrono::duration_cast<std::chrono::microseconds>(end - begin).count();
m_ScriptTimings[path].m_CallCount++;
if (timing != NULL) {
timing->m_Time += std::chrono::duration_cast<std::chrono::microseconds>(end - begin).count();
timing->m_CallCount++;
}

lua_pop(m_State, 1);
Expand Down