[PlaneShift-svn] SF.net SVN: planeshift:[6009] trunk/src/client/modehandler.cpp

[<rly...@us...>]

Revision: 6009
          http://planeshift.svn.sourceforge.net/planeshift/?rev=6009&view=rev
Author:   rlydontknow
Date:     2010-07-06 21:58:26 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
fix potential segfault

Modified Paths:
--------------
    trunk/src/client/modehandler.cpp

Modified: trunk/src/client/modehandler.cpp
===================================================================
--- trunk/src/client/modehandler.cpp	2010-07-06 21:57:27 UTC (rev 6008)
+++ trunk/src/client/modehandler.cpp	2010-07-06 21:58:26 UTC (rev 6009)
@@ -1482,8 +1482,11 @@
     {
         downfall->StopFollow();
         downfall->Destroy();
-        delete downfall;
-        downfall = NULL;
+        if(downfall)
+        {
+            delete downfall;
+            downfall = NULL;
+        }
         Notify2( LOG_WEATHER, "Downfall removed from sector '%s'",
                  sector->QueryObject()->GetName());
     }
@@ -1492,7 +1495,11 @@
     {
         downfall->StopFollow();
         downfall->Destroy();
-        delete downfall;
+        if(downfall)
+        {
+            delete downfall;
+        }
+
         downfall = CreateDownfallWeatherObject(ri);
         if (downfall->CreateMesh())
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.