From: kwolekr <kwolekr@minetest.net>
Date: Thu, 21 Nov 2013 05:49:32 +0000 (-0500)
Subject: Fix possible implicit conversion of NULL to std::string
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=5323d800cc67814938fb668730d474011631fab5;p=zefram%2Fminetest%2Fminetest_engine.git

Fix possible implicit conversion of NULL to std::string
---

diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
index 7415aecb..f22e9b0f 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).