pgimeno
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read_schematic_replacements: ensure fields are strings (#5726) 

* read_schematic_replacements: ensure fields are strings

add a type check before reading strings on read_schematic_replacements deserializer

* throw LuaError instead of asserting the whole client
master
Loïc Blot 2017-05-08 20:43:03 +02:00 committed by GitHub
parent 5e04f1a335
commit c07c642ab0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/lua_api/l_mapgen.cpp
View File

@ -325,14 +325,22 @@ void read_schematic_replacements(lua_State *L, int index, StringMap *replace_nam
if (lua_istable(L, -1)) { // Old {{"x", "y"}, ...} format if (lua_istable(L, -1)) { // Old {{"x", "y"}, ...} format
lua_rawgeti(L, -1, 1); lua_rawgeti(L, -1, 1);
if (!lua_isstring(L, -1))
throw LuaError("schematics: replace_from field is not a string");
replace_from = lua_tostring(L, -1); replace_from = lua_tostring(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
lua_rawgeti(L, -1, 2); lua_rawgeti(L, -1, 2);
if (!lua_isstring(L, -1))
throw LuaError("schematics: replace_to field is not a string");
replace_to = lua_tostring(L, -1); replace_to = lua_tostring(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
} else { // New {x = "y", ...} format } else { // New {x = "y", ...} format
if (!lua_isstring(L, -2))
throw LuaError("schematics: replace_from field is not a string");
replace_from = lua_tostring(L, -2); replace_from = lua_tostring(L, -2);
if (!lua_isstring(L, -1))
throw LuaError("schematics: replace_to field is not a string");
replace_to = lua_tostring(L, -1); replace_to = lua_tostring(L, -1);
} }