Fix possible crashes

otland · Jul 30, 2013 · 7e02d7f · 7e02d7f
1 parent 7e185b7
commit 7e02d7f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/src/container.cpp b/src/container.cpp
@@ -188,7 +188,9 @@ std::ostringstream& Container::getContentDescription(std::ostringstream& os) con
 	Container* evil = const_cast<Container*>(this);
 
 	for (ContainerIterator cit = evil->begin(); cit != evil->end(); ++cit) {
-		Container* container = (*cit)->getContainer();
+		Item* item = (*cit);
+
+		Container* container = item->getContainer();
 		if (container && container->size() != 0) {
 			continue;
 		}
@@ -199,7 +201,7 @@ std::ostringstream& Container::getContentDescription(std::ostringstream& os) con
 			os << ", ";
 		}
 
-		os << container->getNameDescription();
+		os << item->getNameDescription();
 	}
 
 	if (firstitem) {

diff --git a/src/movement.cpp b/src/movement.cpp
@@ -393,11 +393,7 @@ uint32_t MoveEvents::onCreatureMove(Creature* creature, const Tile* tile, bool i
 		eventType = MOVE_EVENT_STEP_OUT;
 	}
 
-	Position pos(0, 0, 0);
-
-	if (tile) {
-		pos = tile->getPosition();
-	}
+	Position pos = tile->getPosition();
 
 	uint32_t ret = 1;
 

diff --git a/src/npc.cpp b/src/npc.cpp
@@ -318,9 +318,7 @@ void Npc::onCreatureAppear(const Creature* creature, bool isLogin)
 		if (m_npcEventHandler) {
 			m_npcEventHandler->onCreatureAppear(creature);
 		}
-	}
-	//only players for script events
-	else if (creature->getPlayer()) {
+	} else if (creature->getPlayer()) {
 		if (m_npcEventHandler) {
 			m_npcEventHandler->onCreatureAppear(creature);
 		}

diff --git a/src/player.cpp b/src/player.cpp
@@ -3302,7 +3302,7 @@ Cylinder* Player::__queryDestination(int32_t& index, const Thing* thing, Item**
 				}
 
 				//try find an already existing item to stack with
-				if (tmpItem != item && tmpItem->getID() == item->getID() && tmpItem->getItemCount() < 100) {
+				if (tmpItem->getID() == item->getID() && tmpItem->getItemCount() < 100) {
 					index = n;
 					*destItem = tmpItem;
 					return tmpContainer;

diff --git a/src/spells.cpp b/src/spells.cpp
@@ -1158,7 +1158,9 @@ bool InstantSpell::playerCastInstant(Player* player, std::string& param)
 				useDirection = true;
 			}
 
-			param = playerTarget->getName();
+			if (playerTarget) {
+				param = playerTarget->getName();
+			}
 		} else {
 			target = player->getAttackedCreature();