oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix invalid listname and listsize not handled correctly in set_size

Browse source
This commit is contained in:
sapier 2013-11-12 00:06:14 +01:00 • committed by PilzAdam
parent 35606cfb67
commit 90e7832408
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/script/lua_api/l_inventory.cpp
View file

@ -117,24 +117,38 @@ int InvRef::l_set_size(lua_State *L)
NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
int newsize = luaL_checknumber(L, 3);
if (newsize < 0) {
lua_pushboolean(L, false);
return 1;
}
Inventory *inv = getinv(L, ref);
if(inv == NULL){
return 0;
lua_pushboolean(L, false);
return 1;
}
if(newsize == 0){
inv->deleteList(listname);
reportInventoryChange(L, ref);
return 0;
lua_pushboolean(L, true);
return 1;
}
InventoryList *list = inv->getList(listname);
if(list){
list->setSize(newsize);
} else {
list = inv->addList(listname, newsize);
if (!list)
{
lua_pushboolean(L, false);
return 1;
}
}
reportInventoryChange(L, ref);
return 0;
lua_pushboolean(L, true);
return 1;
}
// set_width(self, listname, size)