mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix memory corruption after automation macro errors

Browse source 
Originally committed to SVN as r6464.
This commit is contained in:
Thomas Goyne 2012-02-10 01:41:22 +00:00
parent fbc93bb98a
commit 3fd457ac68
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
aegisub/src/auto4_lua.cpp
View file

@ -158,7 +158,7 @@ namespace {
lua_pushvalue(L, i); lua_pushvalue(L, i);
wxString type(lua_typename(L, lua_type(L, -1)), wxConvUTF8); wxString type(lua_typename(L, lua_type(L, -1)), wxConvUTF8);
if (lua_isstring(L, i)) { if (lua_isstring(L, i)) {
LOG_D("automation/lua/stackdump") << type << ": " << luatostring(L, -1); LOG_D("automation/lua/stackdump") << type << ": " << lua_tostring(L, -1);
} else { } else {
LOG_D("automation/lua/stackdump") << type; LOG_D("automation/lua/stackdump") << type;
} }
@ -700,7 +700,9 @@ namespace Automation4 {
void LuaCommand::operator()(agi::Context *c) void LuaCommand::operator()(agi::Context *c)
{ {
LuaStackcheck stackcheck(L);
set_context(L, c); set_context(L, c);
stackcheck.check_stack(0);
GetFeatureFunction("run"); GetFeatureFunction("run");
LuaAssFile *subsobj = new LuaAssFile(L, c->ass, true, true); LuaAssFile *subsobj = new LuaAssFile(L, c->ass, true, true);
@ -722,6 +724,8 @@ namespace Automation4 {
active_idx = 0; active_idx = 0;
} }
} }
stackcheck.check_stack(2);
lua_pop(L, 1); lua_pop(L, 1);
// top of stack will be selected lines array, if any was returned // top of stack will be selected lines array, if any was returned
@ -758,13 +762,14 @@ namespace Automation4 {
if (active_line && (active_idx > 0 || !sel.count(c->selectionController->GetActiveLine()))) if (active_line && (active_idx > 0 || !sel.count(c->selectionController->GetActiveLine())))
c->selectionController->SetActiveLine(active_line); c->selectionController->SetActiveLine(active_line);
} }
stackcheck.check_stack(1);
lua_pop(L, 1);
} }
catch (agi::UserCancelException const&) { catch (agi::UserCancelException const&) {
subsobj->Cancel(); subsobj->Cancel();
stackcheck.check_stack(0);
} }
// either way, there will be something on the stack
lua_pop(L, 1);
} }
bool LuaCommand::IsActive(const agi::Context *c) bool LuaCommand::IsActive(const agi::Context *c)