jtrent238
/
MineTest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some nullptr exceptions when handling invalid node inventories

master
MetaDucky 2013-05-26 12:06:35 +02:00 committed by Kahrl
parent db9c86d6c1
commit c893958bb1
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/script/lua_api/l_inventory.cpp
View File

@ -121,6 +121,9 @@ int InvRef::l_set_size(lua_State *L)
const char *listname = luaL_checkstring(L, 2); const char *listname = luaL_checkstring(L, 2);
int newsize = luaL_checknumber(L, 3); int newsize = luaL_checknumber(L, 3);
Inventory *inv = getinv(L, ref); Inventory *inv = getinv(L, ref);
if(inv == NULL){
return 0;
}
if(newsize == 0){ if(newsize == 0){
inv->deleteList(listname); inv->deleteList(listname);
reportInventoryChange(L, ref); reportInventoryChange(L, ref);
@ -144,6 +147,9 @@ int InvRef::l_set_width(lua_State *L)
const char *listname = luaL_checkstring(L, 2); const char *listname = luaL_checkstring(L, 2);
int newwidth = luaL_checknumber(L, 3); int newwidth = luaL_checknumber(L, 3);
Inventory *inv = getinv(L, ref); Inventory *inv = getinv(L, ref);
if(inv == NULL){
return 0;
}
InventoryList *list = inv->getList(listname); InventoryList *list = inv->getList(listname);
if(list){ if(list){
list->setWidth(newwidth); list->setWidth(newwidth);
@ -195,7 +201,11 @@ int InvRef::l_get_list(lua_State *L)
InvRef *ref = checkobject(L, 1); InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2); const char *listname = luaL_checkstring(L, 2);
Inventory *inv = getinv(L, ref); Inventory *inv = getinv(L, ref);
push_inventory_list(inv, listname, L); if(inv){
push_inventory_list(inv, listname, L);
} else {
lua_pushnil(L);
}
return 1; return 1;
} }
@ -206,6 +216,9 @@ int InvRef::l_set_list(lua_State *L)
InvRef *ref = checkobject(L, 1); InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2); const char *listname = luaL_checkstring(L, 2);
Inventory *inv = getinv(L, ref); Inventory *inv = getinv(L, ref);
if(inv == NULL){
return 0;
}
InventoryList *list = inv->getList(listname); InventoryList *list = inv->getList(listname);
if(list) if(list)
read_inventory_list(inv, listname, L, 3, read_inventory_list(inv, listname, L, 3,