Use LuaErrors in security check macros

ShadowNinja · ShadowNinja · commit 88fbe7ca1e54 · 2016-03-07T13:37:15.000-05:00
Throwing a LuaError calls destructors as it propagates up the stack,
wheres lua_error just executes a longjmp.
diff --git a/src/script/cpp_api/s_security.h b/src/script/cpp_api/s_security.h
@@ -25,9 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define CHECK_SECURE_PATH(L, path) \
 	if (!ScriptApiSecurity::checkPath(L, path)) { \
-		lua_pushstring(L, (std::string("Attempt to access external file ") + \
-					path + " with mod security on.").c_str()); \
-		lua_error(L); \
+		throw LuaError(std::string("Attempt to access external file ") + \
+					path + " with mod security on."); \
 	}
 #define CHECK_SECURE_PATH_OPTIONAL(L, path) \
 	if (ScriptApiSecurity::isSecure(L)) { \
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ int ModApiUtil::l_get_us_time(lua_State *L)`
`77`	`77`	`#define CHECK_SECURE_SETTING(L, name) \`
`78`	`78`	`if (ScriptApiSecurity::isSecure(L) && \`
`79`	`79`	`name.compare(0, 7, "secure.") == 0) { \`
`80`		`- lua_pushliteral(L, "Attempt to set secure setting."); \`
`81`		`- lua_error(L); \`
	`80`	`+ throw LuaError("Attempt to set secure setting."); \`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`// setting_set(name, value)`