Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-24 00:23:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from joshbeck/master

Browse Source 
Fixed null pointer dereference errors found by cppcheck
This commit is contained in:
celeron55 2011-09-24 00:55:05 -07:00
commit 63eca0feb2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/environment.cpp
View File

@ -1345,8 +1345,6 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
i.atEnd()==false; i++) i.atEnd()==false; i++)
{ {
ServerActiveObject* obj = i.getNode()->getValue(); ServerActiveObject* obj = i.getNode()->getValue();
u16 id = i.getNode()->getKey();
v3f objectpos = obj->getBasePosition();
// This shouldn't happen but check it // This shouldn't happen but check it
if(obj == NULL) if(obj == NULL)
@ -1357,9 +1355,12 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
continue; continue;
} }
u16 id = i.getNode()->getKey();
v3f objectpos = obj->getBasePosition();
// The block in which the object resides in // The block in which the object resides in
v3s16 blockpos_o = getNodeBlockPos(floatToInt(objectpos, BS)); v3s16 blockpos_o = getNodeBlockPos(floatToInt(objectpos, BS));
// If block is active, don't remove // If block is active, don't remove
if(m_active_blocks.contains(blockpos_o)) if(m_active_blocks.contains(blockpos_o))
continue; continue;

2
src/server.cpp
View File

@ -4109,7 +4109,7 @@ void Server::UpdateCrafting(u16 peer_id)
InventoryList *clist = player->inventory.getList("craft"); InventoryList *clist = player->inventory.getList("craft");
InventoryList *rlist = player->inventory.getList("craftresult"); InventoryList *rlist = player->inventory.getList("craftresult");
if(rlist->getUsedSlots() == 0) if(rlist && rlist->getUsedSlots() == 0)
player->craftresult_is_preview = true; player->craftresult_is_preview = true;
if(rlist && player->craftresult_is_preview) if(rlist && player->craftresult_is_preview)