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

Fix stack corruption when a script tries to select an invalid line

Browse source
This commit is contained in:
Thomas Goyne 2014-12-24 16:24:51 -08:00
parent 84bd682e2e
commit 0a18fe6cd3
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libaegisub/include/libaegisub/lua/utils.h
View file

@ -140,16 +140,20 @@ struct LuaForEachBreak {};
template<typename Func> template<typename Func>
void lua_for_each(lua_State *L, Func&& func) { void lua_for_each(lua_State *L, Func&& func) {
lua_pushnil(L); // initial key {
while (lua_next(L, -2)) { LuaStackcheck stackcheck(L);
try { lua_pushnil(L); // initial key
func(); while (lua_next(L, -2)) {
try {
func();
}
catch (LuaForEachBreak) {
lua_pop(L, 2); // pop value and key
break;
}
lua_pop(L, 1); // pop value, leave key
} }
catch (LuaForEachBreak) { stackcheck.check_stack(0);
lua_pop(L, 1);
break;
}
lua_pop(L, 1); // pop value, leave key
} }
lua_pop(L, 1); // pop table lua_pop(L, 1); // pop table
} }