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

fixed a segfault in case of wrong input from network on the server (reported by spongie)

master
Perttu Ahola 2011-06-19 19:40:41 +03:00
parent bf947833e9
commit 748340fad5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/inventory.cpp
View File

@ -470,7 +470,7 @@ InventoryItem * InventoryList::addItem(u32 i, InventoryItem *newitem)
//setDirty(true); //setDirty(true);
// If it is an empty position, it's an easy job. // If it is an empty position, it's an easy job.
InventoryItem *to_item = m_items[i]; InventoryItem *to_item = getItem(i);
if(to_item == NULL) if(to_item == NULL)
{ {
m_items[i] = newitem; m_items[i] = newitem;
@ -502,7 +502,7 @@ InventoryItem * InventoryList::addItem(u32 i, InventoryItem *newitem)
bool InventoryList::itemFits(u32 i, InventoryItem *newitem) bool InventoryList::itemFits(u32 i, InventoryItem *newitem)
{ {
// If it is an empty position, it's an easy job. // If it is an empty position, it's an easy job.
InventoryItem *to_item = m_items[i]; InventoryItem *to_item = getItem(i);
if(to_item == NULL) if(to_item == NULL)
{ {
return true; return true;
@ -528,7 +528,7 @@ InventoryItem * InventoryList::takeItem(u32 i, u32 count)
//setDirty(true); //setDirty(true);
InventoryItem *item = m_items[i]; InventoryItem *item = getItem(i);
// If it is an empty position, return NULL // If it is an empty position, return NULL
if(item == NULL) if(item == NULL)
return NULL; return NULL;