0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix exceptions crashing our Lua wrapper.

Browse source 
An exception which doesn't derive from std::exception caused our wrapper to
defer a NULL pointer.
This commit is contained in:
Mark de Wever 2011-02-16 19:12:26 +00:00
parent ec0eb48ead
commit 3820b14eb8
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/scripting/lua.cpp
View file

@ -434,20 +434,28 @@ bool luaW_pcall(lua_State *L
if (res)
{
/*
* When an exception is thrown which doesn't derive from
* std::exception m will be NULL pointer.
*/
char const *m = lua_tostring(L, -1);
if (allow_wml_error && strncmp(m, "~wml:", 5) == 0) {
m += 5;
char const *e = strstr(m, "stack traceback");
lg::wml_error << std::string(m, e ? e - m : strlen(m));
} else if (allow_wml_error && strncmp(m, "~lua:", 5) == 0) {
m += 5;
char const *e = NULL, *em = m;
while (em[0] && ((em = strstr(em + 1, "stack traceback"))))
e = em;
chat_message("Lua error", std::string(m, e ? e - m : strlen(m)));
if(m) {
if (allow_wml_error && strncmp(m, "~wml:", 5) == 0) {
m += 5;
char const *e = strstr(m, "stack traceback");
lg::wml_error << std::string(m, e ? e - m : strlen(m));
} else if (allow_wml_error && strncmp(m, "~lua:", 5) == 0) {
m += 5;
char const *e = NULL, *em = m;
while (em[0] && ((em = strstr(em + 1, "stack traceback"))))
e = em;
chat_message("Lua error", std::string(m, e ? e - m : strlen(m)));
} else {
ERR_LUA << m << '\n';
chat_message("Lua error", m);
}
} else {
ERR_LUA << m << '\n';
chat_message("Lua error", m);
chat_message("Lua caught unknown exception", "");
}
lua_pop(L, 2);
return false;