Handle LuaErrors in Lua -> C++ calls on LuaJIT

4 files changed, 23 insertions, 12 deletions

diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index b957dc64f..898271743 100644
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -29,6 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 extern "C" {
 #include "lualib.h"
+#if USE_LUAJIT
+	#include "luajit.h"
+#endif
 }
 
 #include <stdio.h>
@@ -73,6 +76,14 @@ ScriptApiBase::ScriptApiBase()
 	lua_pushlightuserdata(m_luastack, this);
 	lua_setfield(m_luastack, LUA_REGISTRYINDEX, "scriptapi");
 
+	// If we are using LuaJIT add a C++ wrapper function to catch
+	// exceptions thrown in Lua -> C++ calls
+#if USE_LUAJIT
+	lua_pushlightuserdata(m_luastack, (void*) script_exception_wrapper);
+	luaJIT_setmode(m_luastack, -1, LUAJIT_MODE_WRAPCFUNC | LUAJIT_MODE_ON);
+	lua_pop(m_luastack, 1);
+#endif
+
 	m_server = 0;
 	m_environment = 0;
 	m_guiengine = 0;
diff --git a/src/script/cpp_api/s_inventory.cpp b/src/script/cpp_api/s_inventory.cpp
index 4ee6e4be0..8542f0292 100644
--- a/src/script/cpp_api/s_inventory.cpp
+++ b/src/script/cpp_api/s_inventory.cpp
@@ -54,7 +54,7 @@ int ScriptApiDetached::detached_inventory_AllowMove(
 	if(lua_pcall(L, 7, 1, errorhandler))
 		scriptError();
 	if(!lua_isnumber(L, -1))
-		throw LuaError(L, "allow_move should return a number");
+		throw LuaError(NULL, "allow_move should return a number");
 	int ret = luaL_checkinteger(L, -1);
 	lua_pop(L, 2); // Pop integer and error handler
 	return ret;
@@ -86,7 +86,7 @@ int ScriptApiDetached::detached_inventory_AllowPut(
 	if(lua_pcall(L, 5, 1, errorhandler))
 		scriptError();
 	if(!lua_isnumber(L, -1))
-		throw LuaError(L, "allow_put should return a number");
+		throw LuaError(NULL, "allow_put should return a number");
 	int ret = luaL_checkinteger(L, -1);
 	lua_pop(L, 2); // Pop integer and error handler
 	return ret;
@@ -118,7 +118,7 @@ int ScriptApiDetached::detached_inventory_AllowTake(
 	if(lua_pcall(L, 5, 1, errorhandler))
 		scriptError();
 	if(!lua_isnumber(L, -1))
-		throw LuaError(L, "allow_take should return a number");
+		throw LuaError(NULL, "allow_take should return a number");
 	int ret = luaL_checkinteger(L, -1);
 	lua_pop(L, 2); // Pop integer and error handler
 	return ret;
diff --git a/src/script/cpp_api/s_nodemeta.cpp b/src/script/cpp_api/s_nodemeta.cpp
index 1f04383f1..d8fd4dcfe 100644
--- a/src/script/cpp_api/s_nodemeta.cpp
+++ b/src/script/cpp_api/s_nodemeta.cpp
@@ -61,7 +61,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowMove(v3s16 p,
 		scriptError();
 	lua_remove(L, errorhandler); // Remove error handler
 	if(!lua_isnumber(L, -1))
-		throw LuaError(L, "allow_metadata_inventory_move should return a number");
+		throw LuaError(NULL, "allow_metadata_inventory_move should return a number");
 	int num = luaL_checkinteger(L, -1);
 	lua_pop(L, 1); // Pop integer
 	return num;
@@ -99,7 +99,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowPut(v3s16 p,
 		scriptError();
 	lua_remove(L, errorhandler); // Remove error handler
 	if(!lua_isnumber(L, -1))
-		throw LuaError(L, "allow_metadata_inventory_put should return a number");
+		throw LuaError(NULL, "allow_metadata_inventory_put should return a number");
 	int num = luaL_checkinteger(L, -1);
 	lua_pop(L, 1); // Pop integer
 	return num;
@@ -137,7 +137,7 @@ int ScriptApiNodemeta::nodemeta_inventory_AllowTake(v3s16 p,
 		scriptError();
 	lua_remove(L, errorhandler); // Remove error handler
 	if(!lua_isnumber(L, -1))
-		throw LuaError(L, "allow_metadata_inventory_take should return a number");
+		throw LuaError(NULL, "allow_metadata_inventory_take should return a number");
 	int num = luaL_checkinteger(L, -1);
 	lua_pop(L, 1); // Pop integer
 	return num;
diff --git a/src/script/cpp_api/s_server.cpp b/src/script/cpp_api/s_server.cpp
index 4baf90636..98320b578 100644
--- a/src/script/cpp_api/s_server.cpp
+++ b/src/script/cpp_api/s_server.cpp
@@ -33,7 +33,7 @@ bool ScriptApiServer::getAuth(const std::string &playername,
 	getAuthHandler();
 	lua_getfield(L, -1, "get_auth");
 	if(lua_type(L, -1) != LUA_TFUNCTION)
-		throw LuaError(L, "Authentication handler missing get_auth");
+		throw LuaError(NULL, "Authentication handler missing get_auth");
 	lua_pushstring(L, playername.c_str());
 	if(lua_pcall(L, 1, 1, errorhandler))
 		scriptError();
@@ -48,13 +48,13 @@ bool ScriptApiServer::getAuth(const std::string &playername,
 	std::string password;
 	bool found = getstringfield(L, -1, "password", password);
 	if(!found)
-		throw LuaError(L, "Authentication handler didn't return password");
+		throw LuaError(NULL, "Authentication handler didn't return password");
 	if(dst_password)
 		*dst_password = password;
 
 	lua_getfield(L, -1, "privileges");
 	if(!lua_istable(L, -1))
-		throw LuaError(L, "Authentication handler didn't return privilege table");
+		throw LuaError(NULL, "Authentication handler didn't return privilege table");
 	if(dst_privs)
 		readPrivileges(-1, *dst_privs);
 	lua_pop(L, 1);
@@ -74,7 +74,7 @@ void ScriptApiServer::getAuthHandler()
 	}
 	lua_remove(L, -2); // Remove minetest
 	if(lua_type(L, -1) != LUA_TTABLE)
-		throw LuaError(L, "Authentication handler table not valid");
+		throw LuaError(NULL, "Authentication handler table not valid");
 }
 
 void ScriptApiServer::readPrivileges(int index, std::set<std::string> &result)
@@ -108,7 +108,7 @@ void ScriptApiServer::createAuth(const std::string &playername,
 	lua_getfield(L, -1, "create_auth");
 	lua_remove(L, -2); // Remove auth handler
 	if(lua_type(L, -1) != LUA_TFUNCTION)
-		throw LuaError(L, "Authentication handler missing create_auth");
+		throw LuaError(NULL, "Authentication handler missing create_auth");
 	lua_pushstring(L, playername.c_str());
 	lua_pushstring(L, password.c_str());
 	if(lua_pcall(L, 2, 0, errorhandler))
@@ -128,7 +128,7 @@ bool ScriptApiServer::setPassword(const std::string &playername,
 	lua_getfield(L, -1, "set_password");
 	lua_remove(L, -2); // Remove auth handler
 	if(lua_type(L, -1) != LUA_TFUNCTION)
-		throw LuaError(L, "Authentication handler missing set_password");
+		throw LuaError(NULL, "Authentication handler missing set_password");
 	lua_pushstring(L, playername.c_str());
 	lua_pushstring(L, password.c_str());
 	if(lua_pcall(L, 2, 1, errorhandler))