Fix LuaJIT exception wrapper

kahrl · kahrl · commit 3e267a6ece99 · 2014-08-23T20:41:03.000+02:00
diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
@@ -64,8 +64,10 @@ int script_exception_wrapper(lua_State *L, lua_CFunction f)
 		return f(L);  // Call wrapped function and return result.
 	} catch (const char *s) {  // Catch and convert exceptions.
 		lua_pushstring(L, s);
-	} catch (LuaError& e) {
+	} catch (std::exception& e) {
 		lua_pushstring(L, e.what());
+	} catch (...) {
+		lua_pushliteral(L, "caught (...)");
 	}
 	return lua_error(L);  // Rethrow as a Lua error.
 }

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,10 @@ int script_exception_wrapper(lua_State *L, lua_CFunction f)`
`64`	`64`	`return f(L); // Call wrapped function and return result.`
`65`	`65`	`} catch (const char *s) { // Catch and convert exceptions.`
`66`	`66`	`lua_pushstring(L, s);`
`67`		`- } catch (LuaError& e) {`
	`67`	`+ } catch (std::exception& e) {`
`68`	`68`	`lua_pushstring(L, e.what());`
	`69`	`+ } catch (...) {`
	`70`	`+ lua_pushliteral(L, "caught (...)");`
`69`	`71`	`}`
`70`	`72`	`return lua_error(L); // Rethrow as a Lua error.`
`71`	`73`	`}`