iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash on invalid extradata from automation

This commit is contained in:
Thomas Goyne 2014-06-09 17:20:31 -07:00
parent 831fbcd9a0
commit b777cae2fe
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/auto4_lua_assfile.cpp
View File

@ -297,16 +297,18 @@ namespace Automation4 {
dia->Effect = get_string_field(L, "effect", "dialogue");
dia->Text = get_string_field(L, "text", "dialogue");
lua_getfield(L, -1, "extra");
std::vector<uint32_t> new_ids;
lua_pushnil(L);
while (lua_next(L, -2)) {
auto key = get_string_or_default(L, -2);
auto value = get_string_or_default(L, -1);
new_ids.push_back(ass->AddExtradata(key, value));
lua_pop(L, 1);
}
lua_pop(L, 1);
lua_getfield(L, -1, "extra");
auto type = lua_type(L, -1);
if (type != LUA_TNIL && type != LUA_TTABLE)
error(L, "dialogue extradata must be a table");
lua_for_each(L, [&] {
if (lua_type(L, -2) != LUA_TSTRING) return;
new_ids.push_back(ass->AddExtradata(
get_string_or_default(L, -2),
get_string_or_default(L, -1)));
});
dia->ExtradataIds = new_ids;
}
else {