Fix possible implicit conversion of NULL to std::string

kwolekr · kwolekr · commit 5323d800cc67 · 2013-11-21T00:49:32.000-05:00
diff --git 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).

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,9 @@ int script_error_handler(lua_State *L) {`
`57`	`57`
`58`	`58`	`void script_error(lua_State *L)`
`59`	`59`	`{`
`60`		`- throw LuaError(NULL, lua_tostring(L, -1));`
	`60`	`+ const char *s = lua_tostring(L, -1);`
	`61`	`+ std::string str(s ? s : "");`
	`62`	`+ throw LuaError(NULL, str);`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`// Push the list of callbacks (a lua table).`