From: Rogier <rogier777@gmail.com>
Date: Mon, 25 Jul 2016 16:43:15 +0000 (+0200)
Subject: Make minetest abort on lua panic
X-Git-Tag: 0.4.16~578
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a76e7698b21d51594d82e329d3825ee86e653295;p=oweals%2Fminetest.git

Make minetest abort on lua panic

Currently, lua does a regular exit() after a lua panic, which can make
a problem hard to debug. Invoking FATAL_ERROR() instead will print
some useful information, and abort() minetest, so that a debugger can
be used to analyze the situation.
---

diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index 679a517ee..cbe5735a7 100644
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -40,6 +40,7 @@ extern "C" {
 
 #include <stdio.h>
 #include <cstdarg>
+#include <sstream>
 
 
 class ModNameStorer
@@ -77,6 +78,8 @@ ScriptApiBase::ScriptApiBase() :
 	m_luastack = luaL_newstate();
 	FATAL_ERROR_IF(!m_luastack, "luaL_newstate() failed");
 
+	lua_atpanic(m_luastack, &luaPanic);
+
 	luaL_openlibs(m_luastack);
 
 	// Make the ScriptApiBase* accessible to ModApiBase
@@ -120,6 +123,16 @@ ScriptApiBase::~ScriptApiBase()
 	lua_close(m_luastack);
 }
 
+int ScriptApiBase::luaPanic(lua_State *L)
+{
+	std::ostringstream oss;
+	oss << "LUA PANIC: unprotected error in call to Lua API ("
+		<< lua_tostring(L, -1) << ")";
+	FATAL_ERROR(oss.str().c_str());
+	// NOTREACHED
+	return 0;
+}
+
 void ScriptApiBase::loadMod(const std::string &script_path,
 		const std::string &mod_name)
 {
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index f52474f00..c27235255 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -118,6 +118,8 @@ protected:
 #endif
 
 private:
+	static int luaPanic(lua_State *L);
+
 	lua_State*      m_luastack;
 
 	Server*         m_server;