fix(lua): fix C++ stack unwinding bug, we should never invoke lua_error from a catch block
lua_error and luaL_error are based on the longjmp C function. They will not correctly unwind the C++ stack. We should only invoke them after we finished handling the C++ exceptions and unwinding the C++ stack, and invoking the destructors for each object living on the stack. Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
parent
2ccd5cc559
commit
93b02a6fad
1 changed files with 6 additions and 13 deletions
|
@ -105,32 +105,25 @@ void pcall(lua_State * L, int nargs, int nresults, int errorfun) {
|
||||||
throw lua_exception(lua_tostring(L, -1));
|
throw lua_exception(lua_tostring(L, -1));
|
||||||
}
|
}
|
||||||
|
|
||||||
static thread_local std::string g_error_msg;
|
|
||||||
|
|
||||||
int safe_function_wrapper(lua_State * L, lua_CFunction f){
|
int safe_function_wrapper(lua_State * L, lua_CFunction f){
|
||||||
char const * error_msg;
|
|
||||||
try {
|
try {
|
||||||
return f(L);
|
return f(L);
|
||||||
} catch (kernel_exception & e) {
|
} catch (kernel_exception & e) {
|
||||||
std::ostringstream out;
|
std::ostringstream out;
|
||||||
options o = get_global_options(L);
|
options o = get_global_options(L);
|
||||||
out << mk_pair(e.pp(get_global_formatter(L), o), o);
|
out << mk_pair(e.pp(get_global_formatter(L), o), o);
|
||||||
g_error_msg = out.str();
|
lua_pushstring(L, out.str().c_str());
|
||||||
error_msg = g_error_msg.c_str();
|
|
||||||
} catch (elaborator_exception & e) {
|
} catch (elaborator_exception & e) {
|
||||||
push_justification(L, e.get_justification());
|
push_justification(L, e.get_justification());
|
||||||
return lua_error(L);
|
|
||||||
} catch (exception & e) {
|
} catch (exception & e) {
|
||||||
g_error_msg = e.what();
|
lua_pushstring(L, e.what());
|
||||||
error_msg = g_error_msg.c_str();
|
|
||||||
} catch (std::bad_alloc &) {
|
} catch (std::bad_alloc &) {
|
||||||
error_msg = "out of memory";
|
lua_pushstring(L, "out of memory");
|
||||||
} catch (std::exception & e) {
|
} catch (std::exception & e) {
|
||||||
g_error_msg = e.what();
|
lua_pushstring(L, e.what());
|
||||||
error_msg = g_error_msg.c_str();
|
|
||||||
} catch(...) {
|
} catch(...) {
|
||||||
throw;
|
lua_pushstring(L, "unknown error");
|
||||||
}
|
}
|
||||||
return luaL_error(L, error_msg);
|
return lua_error(L);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue