From: Joshua Beck <jxb091000@utdallas.edu>
Date: Sat, 24 Sep 2011 07:11:43 +0000 (-0500)
Subject: Fixed null pointer dereference errors found by cppcheck
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=ae561d705fc6f0d762203016c24c26a3a3a6b986;p=zefram%2Fminetest%2Fminetest_engine.git

Fixed null pointer dereference errors found by cppcheck
---

diff --git a/src/environment.cpp b/src/environment.cpp
index 8103b711..07c535b7 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -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,9 +1355,12 @@ 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));
-		
+
 		// If block is active, don't remove
 		if(m_active_blocks.contains(blockpos_o))
 			continue;
diff --git a/src/server.cpp b/src/server.cpp
index a0441707..ba0efe75 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -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)