Check argument types inside MetaDataRef Lua API (#7045)

sfan5 · SmallJoker · commit 3f2e0c1206ed · 2018-02-18T10:40:45.000+01:00
diff --git a/src/script/lua_api/l_metadata.cpp b/src/script/lua_api/l_metadata.cpp
@@ -95,7 +95,7 @@ int MetaDataRef::l_get_int(lua_State *L)
 	MAP_LOCK_REQUIRED;
 
 	MetaDataRef *ref = checkobject(L, 1);
-	std::string name = lua_tostring(L, 2);
+	std::string name = luaL_checkstring(L, 2);
 
 	Metadata *meta = ref->getmeta(false);
 	if (meta == NULL) {
@@ -114,8 +114,8 @@ int MetaDataRef::l_set_int(lua_State *L)
 	MAP_LOCK_REQUIRED;
 
 	MetaDataRef *ref = checkobject(L, 1);
-	std::string name = lua_tostring(L, 2);
-	int a = lua_tointeger(L, 3);
+	std::string name = luaL_checkstring(L, 2);
+	int a = luaL_checkint(L, 3);
 	std::string str = itos(a);
 
 	Metadata *meta = ref->getmeta(true);
@@ -133,7 +133,7 @@ int MetaDataRef::l_get_float(lua_State *L)
 	MAP_LOCK_REQUIRED;
 
 	MetaDataRef *ref = checkobject(L, 1);
-	std::string name = lua_tostring(L, 2);
+	std::string name = luaL_checkstring(L, 2);
 
 	Metadata *meta = ref->getmeta(false);
 	if (meta == NULL) {
@@ -152,8 +152,8 @@ int MetaDataRef::l_set_float(lua_State *L)
 	MAP_LOCK_REQUIRED;
 
 	MetaDataRef *ref = checkobject(L, 1);
-	std::string name = lua_tostring(L, 2);
-	float a = lua_tonumber(L, 3);
+	std::string name = luaL_checkstring(L, 2);
+	float a = luaL_checknumber(L, 3);
 	std::string str = ftos(a);
 
 	Metadata *meta = ref->getmeta(true);
diff --git a/src/script/lua_api/l_nodemeta.cpp b/src/script/lua_api/l_nodemeta.cpp
@@ -159,7 +159,7 @@ bool NodeMetaRef::handleFromTable(lua_State *L, int table, Metadata *_meta)
 		lua_pushnil(L);
 		while (lua_next(L, inventorytable) != 0) {
 			// key at index -2 and value at index -1
-			std::string name = lua_tostring(L, -2);
+			std::string name = luaL_checkstring(L, -2);
 			read_inventory_list(L, -1, inv, name.c_str(), getServer(L));
 			lua_pop(L, 1); // Remove value, keep key for next iteration
 		}

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ bool NodeMetaRef::handleFromTable(lua_State L, int table, Metadata _meta)`
`159`	`159`	`lua_pushnil(L);`
`160`	`160`	`while (lua_next(L, inventorytable) != 0) {`
`161`	`161`	`// key at index -2 and value at index -1`
`162`		`- std::string name = lua_tostring(L, -2);`
	`162`	`+ std::string name = luaL_checkstring(L, -2);`
`163`	`163`	`read_inventory_list(L, -1, inv, name.c_str(), getServer(L));`
`164`	`164`	`lua_pop(L, 1); // Remove value, keep key for next iteration`
`165`	`165`	`}`