Skip to content
Permalink
Browse files

from_table: Fix crash for missing inventory or field

  • Loading branch information...
SmallJoker authored and sapier committed Jan 2, 2017
1 parent 814ee97 commit 79d752ba4f6f0197627cc20f99b2540f63b6dc88
Showing with 29 additions and 20 deletions.
  1. +2 −1 doc/lua_api.txt
  2. +27 −19 src/script/lua_api/l_nodemeta.cpp
@@ -2781,8 +2781,9 @@ Can be gotten via `minetest.get_meta(pos)`.
* `get_inventory()`: returns `InvRef`
* `to_table()`: returns `nil` or `{fields = {...}, inventory = {list1 = {}, ...}}`
* `from_table(nil or {})`
* to clear metadata, use from_table(nil)
* Any non-table value will clear the metadata
* See "Node Metadata"
* returns `true` on success

### `NodeTimerRef`
Node Timers: a high resolution persistent per-node timer.
@@ -250,42 +250,50 @@ int NodeMetaRef::l_from_table(lua_State *L)
// clear old metadata first
ref->m_env->getMap().removeNodeMetadata(ref->m_p);

if(lua_isnil(L, base)){
if (!lua_istable(L, base)) {
// No metadata
lua_pushboolean(L, true);
return 1;
}

// Create new metadata
NodeMetadata *meta = getmeta(ref, true);
if(meta == NULL){
if (meta == NULL) {
lua_pushboolean(L, false);
return 1;
}

// Set fields
lua_getfield(L, base, "fields");
int fieldstable = lua_gettop(L);
lua_pushnil(L);
while(lua_next(L, fieldstable) != 0){
// key at index -2 and value at index -1
std::string name = lua_tostring(L, -2);
size_t cl;
const char *cs = lua_tolstring(L, -1, &cl);
std::string value(cs, cl);
meta->setString(name, value);
lua_pop(L, 1); // removes value, keeps key for next iteration
if (lua_istable(L, -1)) {
int fieldstable = lua_gettop(L);
lua_pushnil(L);
while (lua_next(L, fieldstable) != 0) {
// key at index -2 and value at index -1
std::string name = lua_tostring(L, -2);
size_t cl;
const char *cs = lua_tolstring(L, -1, &cl);
meta->setString(name, std::string(cs, cl));
lua_pop(L, 1); // Remove value, keep key for next iteration
}
lua_pop(L, 1);
}

// Set inventory
Inventory *inv = meta->getInventory();
lua_getfield(L, base, "inventory");
int inventorytable = lua_gettop(L);
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);
read_inventory_list(L, -1, inv, name.c_str(), getServer(L));
lua_pop(L, 1); // removes value, keeps key for next iteration
if (lua_istable(L, -1)) {
int inventorytable = lua_gettop(L);
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);
read_inventory_list(L, -1, inv, name.c_str(), getServer(L));
lua_pop(L, 1); // Remove value, keep key for next iteration
}
lua_pop(L, 1);
}

reportMetadataChange(ref);
lua_pushboolean(L, true);
return 1;

0 comments on commit 79d752b

Please sign in to comment.
You can’t perform that action at this time.