From 5323d800cc67814938fb668730d474011631fab5 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Thu, 21 Nov 2013 00:49:32 -0500
Subject: Fix possible implicit conversion of NULL to std::string

---
 src/script/common/c_internal.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/script')

diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
index 7415aecb8..f22e9b0ff 100644
--- a/src/script/common/c_internal.cpp
+++ b/src/script/common/c_internal.cpp
@@ -57,7 +57,9 @@ int script_error_handler(lua_State *L) {
 
 void script_error(lua_State *L)
 {
-	throw LuaError(NULL, lua_tostring(L, -1));
+	const char *s = lua_tostring(L, -1);
+	std::string str(s ? s : "");
+	throw LuaError(NULL, str);
 }
 
 // Push the list of callbacks (a lua table).
-- 
cgit v1.2.3