aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2016-03-06 14:41:26 -0500
committerShadowNinja <shadowninja@minetest.net>2016-03-07 13:37:15 -0500
commit88fbe7ca1e5451851ee0c7ab5524c39a7bb703c2 (patch)
tree53cf5103ba59dab58fd03732472be87a44c4a78a /src/script/lua_api
parent04e311a36d15ad6c1e4436f169fe6b45e855009f (diff)
downloadminetest-88fbe7ca1e5451851ee0c7ab5524c39a7bb703c2.tar.gz
minetest-88fbe7ca1e5451851ee0c7ab5524c39a7bb703c2.tar.bz2
minetest-88fbe7ca1e5451851ee0c7ab5524c39a7bb703c2.zip
Use LuaErrors in security check macros
Throwing a LuaError calls destructors as it propagates up the stack, wheres lua_error just executes a longjmp.
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_util.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index df46925d1..98f70d917 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -77,8 +77,7 @@ int ModApiUtil::l_get_us_time(lua_State *L)
#define CHECK_SECURE_SETTING(L, name) \
if (ScriptApiSecurity::isSecure(L) && \
name.compare(0, 7, "secure.") == 0) { \
- lua_pushliteral(L, "Attempt to set secure setting."); \
- lua_error(L); \
+ throw LuaError("Attempt to set secure setting."); \
}
// setting_set(name, value)