aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-11-21 00:49:32 -0500
committerkwolekr <kwolekr@minetest.net>2013-11-21 00:49:32 -0500
commit5323d800cc67814938fb668730d474011631fab5 (patch)
treef6ceecd1a8dcca4530d6a7949e47c00b0515ace0
parent98e4e2b373ccb138c1e1244c2995e80b95340ca1 (diff)
downloadminetest-5323d800cc67814938fb668730d474011631fab5.tar.gz
minetest-5323d800cc67814938fb668730d474011631fab5.tar.bz2
minetest-5323d800cc67814938fb668730d474011631fab5.zip
Fix possible implicit conversion of NULL to std::string
-rw-r--r--src/script/common/c_internal.cpp4
1 files changed, 3 insertions, 1 deletions
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).