From: florianf <florianf@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Date: Tue, 2 Mar 2010 19:02:32 +0000 (+0000)
Subject: Haywire: Fix a null-pointer dereference when Haywire gets hit by an iceblock.
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=acc065e521e117f530bc881512117aad7e4f5fa2;p=supertux.git

Haywire: Fix a null-pointer dereference when Haywire gets hit by an iceblock.


git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6520 837edb03-e0f3-0310-88ca-d4d4e8b29345
---

diff --git a/src/badguy/haywire.cpp b/src/badguy/haywire.cpp
index a99cb3b20..225251570 100644
--- a/src/badguy/haywire.cpp
+++ b/src/badguy/haywire.cpp
@@ -90,7 +90,8 @@ Haywire::collision_squished(GameObject& object)
   }
 
   if (is_stunned) {
-    player->bounce (*this);
+    if (player)
+      player->bounce (*this);
     return true;
   }
 
@@ -106,7 +107,9 @@ Haywire::collision_squished(GameObject& object)
   time_stunned = TIME_STUNNED;
   is_stunned = true;
 
-  player->bounce (*this);
+  if (player)
+    player->bounce (*this);
+
   return true;
 }