minetest-stuffs
/
dragonfire-client-dragonfire
1
0
Fork 0
Code Issues 10 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #10 from joshbeck/master 

Fixed null pointer dereference errors found by cppcheck
pull/10/head
celeron55 2011-09-24 00:55:05 -07:00
parent 789c88509c ae561d705f
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

5
src/environment.cpp
View File

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

2
src/server.cpp
View File

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